regenerated all models

39 files changed, 749 insertions, 553 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel
index 7a3799d3d3..7a3799d3d3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java
index 26b33e2c1f..25694af0c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java
@@ -8,18 +8,16 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IContainedElementNoParentLink.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: IContainedElementNoParentLink.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IContained Element No Parent Link</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IContained Element No Parent Link</b></em>'.
  * <!-- end-user-doc -->
- *
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIContainedElementNoParentLink()
  * @model interface="true" abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java
index dde72022a2..588f860806 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IMultiRefContainedElement.java,v 1.1 2009-08-12 17:15:43 estepper Exp $
+ * $Id: IMultiRefContainedElement.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMulti Ref Contained Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Contained Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,14 +31,15 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefContainedElement extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Parent</b></em>' container reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Parent</b></em>' container reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}'. <!--
+   * begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Parent</em>' container reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a
+   * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Parent</em>' container reference.
    * @see #setParent(IMultiRefContainer)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement_Parent()
@@ -51,10 +50,12 @@ public interface IMultiRefContainedElement extends EObject
   IMultiRefContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' container reference.
+   * Sets the value of the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}'
+   * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' container reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java
index 66d284f889..c1c46a69cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IMultiRefContainer.java,v 1.1 2009-08-12 17:15:43 estepper Exp $
+ * $Id: IMultiRefContainer.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
@@ -16,17 +16,15 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMulti Ref Container</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Container</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -34,15 +32,16 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefContainer extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement}. It is bidirectional and its
+   * opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent
+   * <em>Parent</em>}'. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear, there really should be more of a
+   * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainer_Elements()
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java
index 6fadf88736..d14e63cc78 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IMultiRefContainerNPL.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: IMultiRefContainerNPL.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
@@ -16,17 +16,15 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMulti Ref Container NPL</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Container NPL</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -34,14 +32,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink}. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear, there really should be more of a
+   * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java
index c1b95cedf0..954e010571 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IMultiRefNonContainedElement.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: IMultiRefNonContainedElement.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMulti Ref Non Contained Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Non Contained Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,14 +31,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefNonContainedElement extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Parent</b></em>' reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}'.
+   * Returns the value of the '<em><b>Parent</b></em>' reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}'.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Parent</em>' reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Parent</em>' reference.
    * @see #setParent(IMultiRefNonContainer)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement_Parent()
@@ -51,10 +49,12 @@ public interface IMultiRefNonContainedElement extends EObject
   IMultiRefNonContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' reference.
+   * Sets the value of the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java
index 14ddcfdc24..af8434ee4b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IMultiRefNonContainer.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: IMultiRefNonContainer.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
@@ -16,17 +16,15 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMulti Ref Non Container</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Non Container</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -34,15 +32,16 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefNonContainer extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement}. It is bidirectional and its
+   * opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent
+   * <em>Parent</em>}'. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Elements</em>' reference list isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Elements</em>' reference list isn't clear, there really should be more of a description
+   * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer_Elements()
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java
index ff0fce8eff..787d0a87e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: IMultiRefNonContainerNPL.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: IMultiRefNonContainerNPL.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
@@ -16,17 +16,15 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMulti Ref Non Container NPL</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Non Container NPL</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -34,14 +32,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefNonContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink}. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Elements</em>' reference list isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Elements</em>' reference list isn't clear, there really should be more of a description
+   * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java
index 9b0a7a2999..7be1147adf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java
@@ -8,24 +8,21 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: INamedElement.java,v 1.1 2009-08-12 17:15:43 estepper Exp $
+ * $Id: INamedElement.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>INamed Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>INamed Element</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getINamedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,13 +30,12 @@ import org.eclipse.emf.ecore.EObject;
 public interface INamedElement extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getINamedElement_Name()
@@ -49,10 +45,11 @@ public interface INamedElement extends EObject
   String getName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement#getName
+   * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java
index 1bdef38c14..4edcd41f56 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: ISingleRefContainedElement.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: ISingleRefContainedElement.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISingle Ref Contained Element</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Contained Element</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,14 +31,15 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefContainedElement extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Parent</b></em>' container reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Parent</b></em>' container reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}'. <!--
+   * begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Parent</em>' container reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a
+   * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Parent</em>' container reference.
    * @see #setParent(ISingleRefContainer)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainedElement_Parent()
@@ -51,10 +50,12 @@ public interface ISingleRefContainedElement extends EObject
   ISingleRefContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' container reference.
+   * Sets the value of the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}'
+   * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' container reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java
index 9427f75dd0..f6deee765a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: ISingleRefContainer.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: ISingleRefContainer.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISingle Ref Container</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Container</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,14 +31,15 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefContainer extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Element</b></em>' containment reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}'.
+   * Returns the value of the '<em><b>Element</b></em>' containment reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}'.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Element</em>' containment reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Element</em>' containment reference isn't clear, there really should be more of a
+   * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Element</em>' containment reference.
    * @see #setElement(ISingleRefContainedElement)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainer_Element()
@@ -51,10 +50,11 @@ public interface ISingleRefContainer extends EObject
   ISingleRefContainedElement getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' containment reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement
+   * <em>Element</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' containment reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java
index 57708ca798..511506cf70 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: ISingleRefContainerNPL.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: ISingleRefContainerNPL.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISingle Ref Container NPL</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Container NPL</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,13 +31,13 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Element</b></em>' containment reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Element</em>' containment reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Element</em>' containment reference isn't clear, there really should be more of a
+   * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Element</em>' containment reference.
    * @see #setElement(IContainedElementNoParentLink)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL_Element()
@@ -49,10 +47,11 @@ public interface ISingleRefContainerNPL extends EObject
   IContainedElementNoParentLink getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' containment reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL#getElement
+   * <em>Element</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' containment reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java
index 8724bc66dc..3528a68b0c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java
@@ -8,24 +8,23 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: ISingleRefNonContainedElement.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: ISingleRefNonContainedElement.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISingle Ref Non Contained Element</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Non Contained Element</b></em>'.
  * <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}
+ * </li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,14 +32,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefNonContainedElement extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Parent</b></em>' reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Parent</b></em>' reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}'. <!--
+   * begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Parent</em>' reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Parent</em>' reference.
    * @see #setParent(ISingleRefNonContainer)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement_Parent()
@@ -51,10 +50,12 @@ public interface ISingleRefNonContainedElement extends EObject
   ISingleRefNonContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' reference.
+   * Sets the value of the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java
index 6b64119a91..9ecca4ec57 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: ISingleRefNonContainer.java,v 1.1 2009-08-12 17:15:42 estepper Exp $
+ * $Id: ISingleRefNonContainer.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISingle Ref Non Container</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Non Container</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,14 +31,15 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefNonContainer extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Element</b></em>' reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}'.
+   * Returns the value of the '<em><b>Element</b></em>' reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}'.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Element</em>' reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Element</em>' reference isn't clear, there really should be more of a description
+   * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Element</em>' reference.
    * @see #setElement(ISingleRefNonContainedElement)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainer_Element()
@@ -51,10 +50,11 @@ public interface ISingleRefNonContainer extends EObject
   ISingleRefNonContainedElement getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement
+   * <em>Element</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java
index cf5eef4636..12bdb90796 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java
@@ -8,24 +8,22 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: ISingleRefNonContainerNPL.java,v 1.1 2009-08-12 17:15:43 estepper Exp $
+ * $Id: ISingleRefNonContainerNPL.java,v 1.2 2009-08-22 09:34:16 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
 
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISingle Ref Non Container NPL</b></em>'.
- * <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Non Container NPL</b></em>'. <!--
+ * end-user-doc -->
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -33,13 +31,13 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefNonContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Element</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Element</b></em>' reference. <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Element</em>' reference isn't clear,
-   * there really should be more of a description here...
+   * If the meaning of the '<em>Element</em>' reference isn't clear, there really should be more of a description
+   * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Element</em>' reference.
    * @see #setElement(IContainedElementNoParentLink)
    * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
@@ -49,10 +47,12 @@ public interface ISingleRefNonContainerNPL extends EObject
   IContainedElementNoParentLink getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' reference.
+   * Sets the value of the '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java
index 4897c152a9..a319a78926 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java
@@ -21,13 +21,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 model4interfacesFactoryImpl extends EFactoryImpl implements model4interfacesFactory
 {
   /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static model4interfacesFactory init()
@@ -49,8 +50,8 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
   }
 
   /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesFactoryImpl()
@@ -60,6 +61,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -74,6 +76,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesPackage getmodel4interfacesPackage()
@@ -83,6 +86,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
index 2d23f7713e..41ea78c3f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -35,90 +35,105 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class model4interfacesPackageImpl extends EPackageImpl implements model4interfacesPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefNonContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefNonContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iNamedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iContainedElementNoParentLinkEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefNonContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefNonContainerNPLEClass = null;
@@ -143,17 +158,18 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+   * <p>
+   * This method is used to initialize {@link model4interfacesPackage#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 -->
    * 
-   * <p>This method is used to initialize {@link model4interfacesPackage#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()
@@ -187,6 +203,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefContainer()
@@ -196,6 +213,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefContainer_Element()
@@ -205,6 +223,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefContainedElement()
@@ -214,6 +233,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefContainedElement_Parent()
@@ -223,6 +243,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefNonContainer()
@@ -232,6 +253,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefNonContainer_Element()
@@ -241,6 +263,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefNonContainedElement()
@@ -250,6 +273,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefNonContainedElement_Parent()
@@ -259,6 +283,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefContainer()
@@ -268,6 +293,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefContainer_Elements()
@@ -277,6 +303,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefContainedElement()
@@ -286,6 +313,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefContainedElement_Parent()
@@ -295,6 +323,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefNonContainer()
@@ -304,6 +333,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefNonContainer_Elements()
@@ -313,6 +343,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefNonContainedElement()
@@ -322,6 +353,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefNonContainedElement_Parent()
@@ -331,6 +363,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getINamedElement()
@@ -340,6 +373,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getINamedElement_Name()
@@ -349,6 +383,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIContainedElementNoParentLink()
@@ -358,6 +393,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefContainerNPL()
@@ -367,6 +403,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefContainerNPL_Element()
@@ -376,6 +413,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefNonContainerNPL()
@@ -385,6 +423,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefNonContainerNPL_Element()
@@ -394,6 +433,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefContainerNPL()
@@ -403,6 +443,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefContainerNPL_Elements()
@@ -412,6 +453,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefNonContainerNPL()
@@ -421,6 +463,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefNonContainerNPL_Elements()
@@ -430,6 +473,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesFactory getmodel4interfacesFactory()
@@ -439,14 +483,15 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * 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 -->
+   * 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()
@@ -500,14 +545,15 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * 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 -->
+   * 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.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java
index 9dbc95a098..ae3d47a0e1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java
@@ -34,21 +34,22 @@ 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.model4interfaces.model4interfacesPackage
  * @generated
  */
 public class model4interfacesAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static model4interfacesPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesAdapterFactory()
@@ -60,10 +61,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc --> This implementation
+   * 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
    */
@@ -82,8 +83,8 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected model4interfacesSwitch<Adapter> modelSwitch = new model4interfacesSwitch<Adapter>()
@@ -180,9 +181,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param target the object to adapt.
+   * 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>.
    * @generated
    */
@@ -208,10 +210,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement <em>ISingle Ref Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
+   * <em>ISingle Ref 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.model4interfaces.ISingleRefContainedElement
    * @generated
@@ -222,9 +226,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non Container</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non 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.model4interfaces.ISingleRefNonContainer
    * @generated
@@ -235,10 +241,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement <em>ISingle Ref Non Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
+   * <em>ISingle Ref Non 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.model4interfaces.ISingleRefNonContainedElement
    * @generated
@@ -264,10 +272,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement <em>IMulti Ref Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
+   * <em>IMulti Ref 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.model4interfaces.IMultiRefContainedElement
    * @generated
@@ -278,9 +288,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non Container</em>}'.
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non 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.model4interfaces.IMultiRefNonContainer
    * @generated
@@ -291,10 +303,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement <em>IMulti Ref Non Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
+   * <em>IMulti Ref Non 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.model4interfaces.IMultiRefNonContainedElement
    * @generated
@@ -320,10 +334,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink <em>IContained Element No Parent Link</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
+   * <em>IContained Element No Parent Link</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.model4interfaces.IContainedElementNoParentLink
    * @generated
@@ -334,9 +350,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</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.model4interfaces.ISingleRefContainerNPL
    * @generated
@@ -347,10 +365,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL <em>ISingle Ref Non Container NPL</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
+   * <em>ISingle Ref Non Container NPL</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.model4interfaces.ISingleRefNonContainerNPL
    * @generated
@@ -361,9 +381,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</em>}'.
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</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.model4interfaces.IMultiRefContainerNPL
    * @generated
@@ -374,10 +396,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL <em>IMulti Ref Non Container NPL</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
+   * <em>IMulti Ref Non Container NPL</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.model4interfaces.IMultiRefNonContainerNPL
    * @generated
@@ -388,9 +412,9 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc --> This default implementation returns null. <!--
+   * 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.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
index 19bf163762..72ce692421 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
@@ -36,21 +36,22 @@ 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.model4interfaces.model4interfacesPackage
  * @generated
  */
 public class model4interfacesSwitch<T>
 {
   /**
-   * The cached model package
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static model4interfacesPackage modelPackage;
 
   /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesSwitch()
@@ -64,6 +65,7 @@ public class model4interfacesSwitch<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
    */
@@ -75,6 +77,7 @@ public class model4interfacesSwitch<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
    */
@@ -94,6 +97,7 @@ public class model4interfacesSwitch<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
    */
@@ -347,10 +351,11 @@ public class model4interfacesSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>INamed Element</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.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -441,11 +446,12 @@ public class model4interfacesSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc --> This
+   * 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.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
index 7ffd8b45ad..e35e21c5fa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IContainedElementNoParentLink.java
@@ -15,8 +15,7 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IContained Element No Parent Link</b></em>'.
  * <!-- end-user-doc -->
- *
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIContainedElementNoParentLink()
  * @model interface="true" abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
index d9b9ab9129..3a524b9d02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainedElement.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Contained Element</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -49,9 +48,11 @@ public interface IMultiRefContainedElement extends EObject
   IMultiRefContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent <em>Parent</em>}' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' container reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement#getParent
+   * <em>Parent</em>}' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' container reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
index 49d956e7d1..42257add16 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainer.java
@@ -16,14 +16,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Container</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainer()
  * @model interface="true" abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
index f7421f39ba..149c479611 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefContainerNPL.java
@@ -16,14 +16,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Container NPL</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -31,14 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
index 9ca2db275e..239bf6fa3c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainedElement.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Non Contained Element</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -49,9 +48,11 @@ public interface IMultiRefNonContainedElement extends EObject
   IMultiRefNonContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent
+   * <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
index 1fbcbd7929..1d0fdf7508 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainer.java
@@ -16,14 +16,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Non Container</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -31,15 +30,16 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefNonContainer extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent <em>Parent</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement}. It is bidirectional and its
+   * opposite is '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent
+   * <em>Parent</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer_Elements()
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement#getParent
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
index 34a55afe57..6341fc02de 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/IMultiRefNonContainerNPL.java
@@ -16,14 +16,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>IMulti Ref Non Container NPL</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL#getElements <em>Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -31,14 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface IMultiRefNonContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Elements</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' reference list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Elements</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
index e13d872d1e..ab63b0910e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/INamedElement.java
@@ -14,14 +14,13 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>INamed Element</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -29,12 +28,12 @@ import org.eclipse.emf.ecore.EObject;
 public interface INamedElement extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getINamedElement_Name()
@@ -44,9 +43,11 @@ public interface INamedElement extends EObject
   String getName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName <em>Name</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
index a37188face..3778024b52 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainedElement.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Contained Element</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -49,9 +48,11 @@ public interface ISingleRefContainedElement extends EObject
   ISingleRefContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement#getParent <em>Parent</em>}' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' container reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement#getParent
+   * <em>Parent</em>}' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' container reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
index 9a508b805e..2ea9c08255 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainer.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Container</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -49,9 +48,11 @@ public interface ISingleRefContainer extends EObject
   ISingleRefContainedElement getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer#getElement <em>Element</em>}' containment reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' containment reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer#getElement
+   * <em>Element</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' containment reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
index 6ccab97699..534970b5bd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefContainerNPL.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Container NPL</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -30,13 +29,13 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Element</b></em>' containment reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Element</em>' containment reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Element</em>' containment reference.
    * @see #setElement(IContainedElementNoParentLink)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL_Element()
@@ -46,9 +45,11 @@ public interface ISingleRefContainerNPL extends EObject
   IContainedElementNoParentLink getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement <em>Element</em>}' containment reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' containment reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL#getElement
+   * <em>Element</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' containment reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
index f83530bc9c..bacf51e92e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainedElement.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Non Contained Element</b></em>'.
  * <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement()
  * @model interface="true" abstract="true"
  * @generated
@@ -48,9 +47,11 @@ public interface ISingleRefNonContainedElement extends EObject
   ISingleRefNonContainer getParent();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement#getParent <em>Parent</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement#getParent
+   * <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Parent</em>' reference.
    * @see #getParent()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
index 2b6a5b4f67..308f668684 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainer.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Non Container</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainer()
  * @model interface="true" abstract="true"
  * @generated
@@ -49,9 +48,11 @@ public interface ISingleRefNonContainer extends EObject
   ISingleRefNonContainedElement getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer#getElement <em>Element</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer#getElement
+   * <em>Element</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
index a020493b88..2b5896c0bd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/ISingleRefNonContainerNPL.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>ISingle Ref Non Container NPL</b></em>'. <!--
  * end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL()
  * @model interface="true" abstract="true"
  * @generated
@@ -30,13 +29,13 @@ import org.eclipse.emf.ecore.EObject;
 public interface ISingleRefNonContainerNPL extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Element</b></em>' reference.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Element</b></em>' reference. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Element</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Element</em>' reference.
    * @see #setElement(IContainedElementNoParentLink)
    * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
@@ -46,9 +45,11 @@ public interface ISingleRefNonContainerNPL extends EObject
   IContainedElementNoParentLink getElement();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement <em>Element</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Element</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL#getElement
+   * <em>Element</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Element</em>' reference.
    * @see #getElement()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java
index 5135289e7a..e4f0218c86 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesFactoryImpl.java
@@ -21,13 +21,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 model4interfacesFactoryImpl extends EFactoryImpl implements model4interfacesFactory
 {
   /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static model4interfacesFactory init()
@@ -49,8 +50,8 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
   }
 
   /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesFactoryImpl()
@@ -60,6 +61,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -74,6 +76,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesPackage getmodel4interfacesPackage()
@@ -83,6 +86,7 @@ public class model4interfacesFactoryImpl extends EFactoryImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
index 4a4a272d92..e9c6aff276 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -35,90 +35,105 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class model4interfacesPackageImpl extends EPackageImpl implements model4interfacesPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefNonContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefNonContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefNonContainedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iNamedElementEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iContainedElementNoParentLinkEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iSingleRefNonContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefContainerNPLEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass iMultiRefNonContainerNPLEClass = null;
@@ -143,6 +158,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -187,6 +203,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefContainer()
@@ -196,6 +213,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefContainer_Element()
@@ -205,6 +223,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefContainedElement()
@@ -214,6 +233,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefContainedElement_Parent()
@@ -223,6 +243,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefNonContainer()
@@ -232,6 +253,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefNonContainer_Element()
@@ -241,6 +263,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefNonContainedElement()
@@ -250,6 +273,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefNonContainedElement_Parent()
@@ -259,6 +283,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefContainer()
@@ -268,6 +293,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefContainer_Elements()
@@ -277,6 +303,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefContainedElement()
@@ -286,6 +313,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefContainedElement_Parent()
@@ -295,6 +323,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefNonContainer()
@@ -304,6 +333,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefNonContainer_Elements()
@@ -313,6 +343,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefNonContainedElement()
@@ -322,6 +353,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefNonContainedElement_Parent()
@@ -331,6 +363,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getINamedElement()
@@ -340,6 +373,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getINamedElement_Name()
@@ -349,6 +383,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIContainedElementNoParentLink()
@@ -358,6 +393,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefContainerNPL()
@@ -367,6 +403,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefContainerNPL_Element()
@@ -376,6 +413,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getISingleRefNonContainerNPL()
@@ -385,6 +423,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getISingleRefNonContainerNPL_Element()
@@ -394,6 +433,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefContainerNPL()
@@ -403,6 +443,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefContainerNPL_Elements()
@@ -412,6 +453,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getIMultiRefNonContainerNPL()
@@ -421,6 +463,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getIMultiRefNonContainerNPL_Elements()
@@ -430,6 +473,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesFactory getmodel4interfacesFactory()
@@ -439,14 +483,15 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * 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 -->
+   * 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()
@@ -500,14 +545,15 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * 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 -->
+   * 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.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
index ed9be3f1bc..3c13df76a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesFactory.java
@@ -15,22 +15,23 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- 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.model4interfaces.model4interfacesPackage
  * @generated
  */
 public interface model4interfacesFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   model4interfacesFactory eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl
       .init();
 
   /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 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.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
index 223bf576f8..83cdb6e6a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesFactory
  * @model kind="package"
  * @generated
@@ -31,37 +32,38 @@ import org.eclipse.emf.ecore.EReference;
 public interface model4interfacesPackage extends EPackage
 {
   /**
-   * The package name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNAME = "model4interfaces";
 
   /**
-   * The package namespace URI.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model4interfaces/1.0.0";
 
   /**
-   * The package namespace name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNS_PREFIX = "model4interfaces";
 
   /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   model4interfacesPackage eINSTANCE = org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl
       .init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer
+   * <em>ISingle Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainer()
    * @generated
@@ -78,17 +80,18 @@ public interface model4interfacesPackage extends EPackage
   int ISINGLE_REF_CONTAINER__ELEMENT = 0;
 
   /**
-   * The number of structural features of the '<em>ISingle Ref Container</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>ISingle Ref Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_CONTAINER_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement <em>ISingle Ref Contained Element</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
+   * <em>ISingle Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainedElement()
    * @generated
@@ -96,25 +99,26 @@ public interface model4interfacesPackage extends EPackage
   int ISINGLE_REF_CONTAINED_ELEMENT = 1;
 
   /**
-   * The feature id for the '<em><b>Parent</b></em>' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_CONTAINED_ELEMENT__PARENT = 0;
 
   /**
-   * The number of structural features of the '<em>ISingle Ref Contained Element</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>ISingle Ref Contained Element</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non Container</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer
+   * <em>ISingle Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainer()
    * @generated
@@ -122,25 +126,26 @@ public interface model4interfacesPackage extends EPackage
   int ISINGLE_REF_NON_CONTAINER = 2;
 
   /**
-   * The feature id for the '<em><b>Element</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_NON_CONTAINER__ELEMENT = 0;
 
   /**
-   * The number of structural features of the '<em>ISingle Ref Non Container</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>ISingle Ref Non Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_NON_CONTAINER_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement <em>ISingle Ref Non Contained Element</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
+   * <em>ISingle Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainedElement()
    * @generated
@@ -148,25 +153,26 @@ public interface model4interfacesPackage extends EPackage
   int ISINGLE_REF_NON_CONTAINED_ELEMENT = 3;
 
   /**
-   * The feature id for the '<em><b>Parent</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = 0;
 
   /**
-   * The number of structural features of the '<em>ISingle Ref Non Contained Element</em>' class.
-   * <!-- begin-user-doc
+   * The number of structural features of the '<em>ISingle Ref Non Contained Element</em>' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer <em>IMulti Ref Container</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
+   * <em>IMulti Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainer()
    * @generated
@@ -174,26 +180,27 @@ public interface model4interfacesPackage extends EPackage
   int IMULTI_REF_CONTAINER = 4;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_CONTAINER__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>IMulti Ref Container</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>IMulti Ref Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_CONTAINER_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement <em>IMulti Ref Contained Element</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
+   * <em>IMulti Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainedElement()
    * @generated
@@ -201,25 +208,26 @@ public interface model4interfacesPackage extends EPackage
   int IMULTI_REF_CONTAINED_ELEMENT = 5;
 
   /**
-   * The feature id for the '<em><b>Parent</b></em>' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_CONTAINED_ELEMENT__PARENT = 0;
 
   /**
-   * The number of structural features of the '<em>IMulti Ref Contained Element</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>IMulti Ref Contained Element</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non Container</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer
+   * <em>IMulti Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainer()
    * @generated
@@ -227,25 +235,26 @@ public interface model4interfacesPackage extends EPackage
   int IMULTI_REF_NON_CONTAINER = 6;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_NON_CONTAINER__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>IMulti Ref Non Container</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>IMulti Ref Non Container</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_NON_CONTAINER_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement <em>IMulti Ref Non Contained Element</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
+   * <em>IMulti Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainedElement()
    * @generated
@@ -253,25 +262,26 @@ public interface model4interfacesPackage extends EPackage
   int IMULTI_REF_NON_CONTAINED_ELEMENT = 7;
 
   /**
-   * The feature id for the '<em><b>Parent</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Parent</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT = 0;
 
   /**
-   * The number of structural features of the '<em>IMulti Ref Non Contained Element</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>IMulti Ref Non Contained Element</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement <em>INamed Element</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
+   * <em>INamed Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getINamedElement()
    * @generated
@@ -279,8 +289,8 @@ public interface model4interfacesPackage extends EPackage
   int INAMED_ELEMENT = 8;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -296,8 +306,9 @@ public interface model4interfacesPackage extends EPackage
   int INAMED_ELEMENT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink <em>IContained Element No Parent Link</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
+   * <em>IContained Element No Parent Link</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIContainedElementNoParentLink()
    * @generated
@@ -305,17 +316,18 @@ public interface model4interfacesPackage extends EPackage
   int ICONTAINED_ELEMENT_NO_PARENT_LINK = 9;
 
   /**
-   * The number of structural features of the '<em>IContained Element No Parent Link</em>' class.
-   * <!-- begin-user-doc
+   * The number of structural features of the '<em>IContained Element No Parent Link</em>' class. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT = 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL
+   * <em>ISingle Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainerNPL()
    * @generated
@@ -332,17 +344,18 @@ public interface model4interfacesPackage extends EPackage
   int ISINGLE_REF_CONTAINER_NPL__ELEMENT = 0;
 
   /**
-   * The number of structural features of the '<em>ISingle Ref Container NPL</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>ISingle Ref Container NPL</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_CONTAINER_NPL_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL <em>ISingle Ref Non Container NPL</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
+   * <em>ISingle Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainerNPL()
    * @generated
@@ -350,25 +363,26 @@ public interface model4interfacesPackage extends EPackage
   int ISINGLE_REF_NON_CONTAINER_NPL = 11;
 
   /**
-   * The feature id for the '<em><b>Element</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Element</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT = 0;
 
   /**
-   * The number of structural features of the '<em>ISingle Ref Non Container NPL</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>ISingle Ref Non Container NPL</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL
+   * <em>IMulti Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainerNPL()
    * @generated
@@ -376,26 +390,27 @@ public interface model4interfacesPackage extends EPackage
   int IMULTI_REF_CONTAINER_NPL = 12;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_CONTAINER_NPL__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>IMulti Ref Container NPL</em>' class.
-   * <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>IMulti Ref Container NPL</em>' class. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_CONTAINER_NPL_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL <em>IMulti Ref Non Container NPL</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
+   * <em>IMulti Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
    * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainerNPL()
    * @generated
@@ -403,25 +418,26 @@ public interface model4interfacesPackage extends EPackage
   int IMULTI_REF_NON_CONTAINER_NPL = 13;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Elements</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>IMulti Ref Non Container NPL</em>' class.
-   * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>IMulti Ref Non Container NPL</em>' class. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = 1;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer
+   * <em>ISingle Ref Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>ISingle Ref Container</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer
    * @generated
@@ -441,8 +457,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getISingleRefContainer_Element();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement <em>ISingle Ref Contained Element</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
+   * <em>ISingle Ref Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>ISingle Ref Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
    * @generated
@@ -462,8 +479,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getISingleRefContainedElement_Parent();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non Container</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer
+   * <em>ISingle Ref Non Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>ISingle Ref Non Container</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer
    * @generated
@@ -483,8 +501,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getISingleRefNonContainer_Element();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement <em>ISingle Ref Non Contained Element</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
+   * <em>ISingle Ref Non Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>ISingle Ref Non Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
    * @generated
@@ -504,8 +523,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getISingleRefNonContainedElement_Parent();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer <em>IMulti Ref Container</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
+   * <em>IMulti Ref Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IMulti Ref Container</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
    * @generated
@@ -525,8 +545,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getIMultiRefContainer_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement <em>IMulti Ref Contained Element</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
+   * <em>IMulti Ref Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IMulti Ref Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
    * @generated
@@ -546,8 +567,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getIMultiRefContainedElement_Parent();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non Container</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer
+   * <em>IMulti Ref Non Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IMulti Ref Non Container</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer
    * @generated
@@ -567,8 +589,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getIMultiRefNonContainer_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement <em>IMulti Ref Non Contained Element</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
+   * <em>IMulti Ref Non Contained Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IMulti Ref Non Contained Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
    * @generated
@@ -588,8 +611,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getIMultiRefNonContainedElement_Parent();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement <em>INamed Element</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
+   * <em>INamed Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>INamed Element</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
    * @generated
@@ -597,8 +621,9 @@ public interface model4interfacesPackage extends EPackage
   EClass getINamedElement();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement#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.model4interfaces.INamedElement#getName()
    * @see #getINamedElement()
@@ -607,8 +632,9 @@ public interface model4interfacesPackage extends EPackage
   EAttribute getINamedElement_Name();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink <em>IContained Element No Parent Link</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
+   * <em>IContained Element No Parent Link</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IContained Element No Parent Link</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
    * @generated
@@ -616,8 +642,9 @@ public interface model4interfacesPackage extends EPackage
   EClass getIContainedElementNoParentLink();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL
+   * <em>ISingle Ref Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>ISingle Ref Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL
    * @generated
@@ -637,8 +664,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getISingleRefContainerNPL_Element();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL <em>ISingle Ref Non Container NPL</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
+   * <em>ISingle Ref Non Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>ISingle Ref Non Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
    * @generated
@@ -658,8 +686,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getISingleRefNonContainerNPL_Element();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL
+   * <em>IMulti Ref Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IMulti Ref Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL
    * @generated
@@ -679,8 +708,9 @@ public interface model4interfacesPackage extends EPackage
   EReference getIMultiRefContainerNPL_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL <em>IMulti Ref Non Container NPL</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
+   * <em>IMulti Ref Non Container NPL</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>IMulti Ref Non Container NPL</em>'.
    * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
    * @generated
@@ -700,8 +730,8 @@ public interface model4interfacesPackage extends EPackage
   EReference getIMultiRefNonContainerNPL_Elements();
 
   /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 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
    */
@@ -716,13 +746,15 @@ public interface model4interfacesPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
+   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer
+     * <em>ISingle Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainer()
      * @generated
@@ -730,16 +762,17 @@ public interface model4interfacesPackage extends EPackage
     EClass ISINGLE_REF_CONTAINER = eINSTANCE.getISingleRefContainer();
 
     /**
-     * The meta object literal for the '<em><b>Element</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference ISINGLE_REF_CONTAINER__ELEMENT = eINSTANCE.getISingleRefContainer_Element();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement <em>ISingle Ref Contained Element</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
+     * <em>ISingle Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainedElement()
      * @generated
@@ -747,16 +780,17 @@ public interface model4interfacesPackage extends EPackage
     EClass ISINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getISingleRefContainedElement();
 
     /**
-     * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference ISINGLE_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefContainedElement_Parent();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non Container</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer
+     * <em>ISingle Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainer()
      * @generated
@@ -764,16 +798,17 @@ public interface model4interfacesPackage extends EPackage
     EClass ISINGLE_REF_NON_CONTAINER = eINSTANCE.getISingleRefNonContainer();
 
     /**
-     * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference ISINGLE_REF_NON_CONTAINER__ELEMENT = eINSTANCE.getISingleRefNonContainer_Element();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement <em>ISingle Ref Non Contained Element</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
+     * <em>ISingle Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainedElement()
      * @generated
@@ -781,16 +816,17 @@ public interface model4interfacesPackage extends EPackage
     EClass ISINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getISingleRefNonContainedElement();
 
     /**
-     * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefNonContainedElement_Parent();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer <em>IMulti Ref Container</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
+     * <em>IMulti Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainer()
      * @generated
@@ -806,8 +842,9 @@ public interface model4interfacesPackage extends EPackage
     EReference IMULTI_REF_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefContainer_Elements();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement <em>IMulti Ref Contained Element</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
+     * <em>IMulti Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainedElement()
      * @generated
@@ -815,16 +852,17 @@ public interface model4interfacesPackage extends EPackage
     EClass IMULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefContainedElement();
 
     /**
-     * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference IMULTI_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefContainedElement_Parent();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non Container</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer
+     * <em>IMulti Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainer()
      * @generated
@@ -832,16 +870,17 @@ public interface model4interfacesPackage extends EPackage
     EClass IMULTI_REF_NON_CONTAINER = eINSTANCE.getIMultiRefNonContainer();
 
     /**
-     * The meta object literal for the '<em><b>Elements</b></em>' reference list feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference IMULTI_REF_NON_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefNonContainer_Elements();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement <em>IMulti Ref Non Contained Element</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
+     * <em>IMulti Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainedElement()
      * @generated
@@ -849,16 +888,17 @@ public interface model4interfacesPackage extends EPackage
     EClass IMULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefNonContainedElement();
 
     /**
-     * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefNonContainedElement_Parent();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement <em>INamed Element</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
+     * <em>INamed Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getINamedElement()
      * @generated
@@ -866,16 +906,17 @@ public interface model4interfacesPackage extends EPackage
     EClass INAMED_ELEMENT = eINSTANCE.getINamedElement();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute INAMED_ELEMENT__NAME = eINSTANCE.getINamedElement_Name();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink <em>IContained Element No Parent Link</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
+     * <em>IContained Element No Parent Link</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIContainedElementNoParentLink()
      * @generated
@@ -883,8 +924,9 @@ public interface model4interfacesPackage extends EPackage
     EClass ICONTAINED_ELEMENT_NO_PARENT_LINK = eINSTANCE.getIContainedElementNoParentLink();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL
+     * <em>ISingle Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainerNPL()
      * @generated
@@ -892,16 +934,17 @@ public interface model4interfacesPackage extends EPackage
     EClass ISINGLE_REF_CONTAINER_NPL = eINSTANCE.getISingleRefContainerNPL();
 
     /**
-     * The meta object literal for the '<em><b>Element</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference ISINGLE_REF_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefContainerNPL_Element();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL <em>ISingle Ref Non Container NPL</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
+     * <em>ISingle Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainerNPL()
      * @generated
@@ -909,16 +952,17 @@ public interface model4interfacesPackage extends EPackage
     EClass ISINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getISingleRefNonContainerNPL();
 
     /**
-     * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefNonContainerNPL_Element();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL
+     * <em>IMulti Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainerNPL()
      * @generated
@@ -934,8 +978,9 @@ public interface model4interfacesPackage extends EPackage
     EReference IMULTI_REF_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefContainerNPL_Elements();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL <em>IMulti Ref Non Container NPL</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
+     * <em>IMulti Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL
      * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainerNPL()
      * @generated
@@ -943,9 +988,9 @@ public interface model4interfacesPackage extends EPackage
     EClass IMULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getIMultiRefNonContainerNPL();
 
     /**
-     * The meta object literal for the '<em><b>Elements</b></em>' reference list feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefNonContainerNPL_Elements();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesAdapterFactory.java
index 1699695dab..a06ffb9ba1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesAdapterFactory.java
@@ -34,21 +34,22 @@ 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.model4interfaces.model4interfacesPackage
  * @generated
  */
 public class model4interfacesAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static model4interfacesPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesAdapterFactory()
@@ -60,10 +61,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc --> This implementation
+   * 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
    */
@@ -82,8 +83,8 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected model4interfacesSwitch<Adapter> modelSwitch = new model4interfacesSwitch<Adapter>()
@@ -180,9 +181,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param target the object to adapt.
+   * 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>.
    * @generated
    */
@@ -208,10 +210,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement <em>ISingle Ref Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement
+   * <em>ISingle Ref 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.model4interfaces.ISingleRefContainedElement
    * @generated
@@ -237,10 +241,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement <em>ISingle Ref Non Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement
+   * <em>ISingle Ref Non 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.model4interfaces.ISingleRefNonContainedElement
    * @generated
@@ -251,10 +257,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer <em>IMulti Ref Container</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer
+   * <em>IMulti Ref 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.model4interfaces.IMultiRefContainer
    * @generated
@@ -265,9 +272,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement <em>IMulti Ref Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement <em>IMulti Ref 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.model4interfaces.IMultiRefContainedElement
    * @generated
@@ -293,10 +302,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement <em>IMulti Ref Non Contained Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement
+   * <em>IMulti Ref Non 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.model4interfaces.IMultiRefNonContainedElement
    * @generated
@@ -307,9 +318,10 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement <em>INamed Element</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement
+   * <em>INamed 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.model4interfaces.INamedElement
    * @generated
@@ -320,10 +332,12 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink <em>IContained Element No Parent Link</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink
+   * <em>IContained Element No Parent Link</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.model4interfaces.IContainedElementNoParentLink
    * @generated
@@ -349,9 +363,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL <em>ISingle Ref Non Container NPL</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL <em>ISingle Ref Non Container NPL</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.model4interfaces.ISingleRefNonContainerNPL
    * @generated
@@ -377,9 +393,11 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL <em>IMulti Ref Non Container NPL</em>}'.
+   * Creates a new adapter for an object of class '
+   * {@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL <em>IMulti Ref Non Container NPL</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.model4interfaces.IMultiRefNonContainerNPL
    * @generated
@@ -390,9 +408,9 @@ public class model4interfacesAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc --> This default implementation returns null. <!--
+   * 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.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
index 9df0250689..5279947e7b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
@@ -36,21 +36,22 @@ 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.model4interfaces.model4interfacesPackage
  * @generated
  */
 public class model4interfacesSwitch<T>
 {
   /**
-   * The cached model package
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static model4interfacesPackage modelPackage;
 
   /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public model4interfacesSwitch()
@@ -64,6 +65,7 @@ public class model4interfacesSwitch<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
    */
@@ -75,6 +77,7 @@ public class model4interfacesSwitch<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
    */
@@ -94,6 +97,7 @@ public class model4interfacesSwitch<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
    */
@@ -347,10 +351,11 @@ public class model4interfacesSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>INamed Element</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>INamed Element</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.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>INamed Element</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -441,11 +446,12 @@ public class model4interfacesSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc --> This
+   * 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.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated