mango

22 files changed, 698 insertions, 463 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
index 21b77eb3f9..e51ed4b4ef 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoFactory.java
@@ -15,46 +15,45 @@ 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.mango.MangoPackage
  * @generated
  */
 public interface MangoFactory 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
    */
   MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Value List</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Value List</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Value List</em>'.
    * @generated
    */
   MangoValueList createMangoValueList();
 
   /**
-   * Returns a new object of class '<em>Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Value</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Value</em>'.
    * @generated
    */
   MangoValue createMangoValue();
 
   /**
-   * Returns a new object of class '<em>Parameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Parameter</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Parameter</em>'.
    * @generated
    */
   MangoParameter createMangoParameter();
 
   /**
-   * 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.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
index c6708f45a7..5ad0d3b833 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.tests.mango.MangoFactory
  * @model kind="package"
  * @generated
@@ -33,37 +32,36 @@ import org.eclipse.emf.ecore.EReference;
 public interface MangoPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "mango";
 
   /**
-   * 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/mango";
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "mango";
 
   /**
-   * 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
    */
   MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl <em>Value List</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl <em>Value List</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValueList()
    * @generated
@@ -71,24 +69,24 @@ public interface MangoPackage extends EPackage
   int MANGO_VALUE_LIST = 0;
 
   /**
-   * 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
    */
   int MANGO_VALUE_LIST__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Values</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Values</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_VALUE_LIST__VALUES = 1;
 
   /**
-   * The number of structural features of the '<em>Value List</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Value List</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -105,25 +103,24 @@ public interface MangoPackage extends EPackage
   int MANGO_VALUE = 1;
 
   /**
-   * 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
    */
   int MANGO_VALUE__NAME = 0;
 
   /**
-   * The number of structural features of the '<em>Value</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Value</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_VALUE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl <em>Parameter</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl <em>Parameter</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoParameter()
    * @generated
@@ -131,33 +128,32 @@ public interface MangoPackage extends EPackage
   int MANGO_PARAMETER = 2;
 
   /**
-   * 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
    */
   int MANGO_PARAMETER__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Passing</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Passing</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_PARAMETER__PASSING = 1;
 
   /**
-   * The number of structural features of the '<em>Parameter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Parameter</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_PARAMETER_FEATURE_COUNT = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}'
-   * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}' enum.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
    * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameterPassing()
    * @generated
@@ -167,7 +163,6 @@ public interface MangoPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList <em>Value List</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Value List</em>'.
    * @see org.eclipse.emf.cdo.tests.mango.MangoValueList
    * @generated
@@ -175,9 +170,8 @@ public interface MangoPackage extends EPackage
   EClass getMangoValueList();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#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.mango.MangoValueList#getName()
    * @see #getMangoValueList()
@@ -186,9 +180,8 @@ public interface MangoPackage extends EPackage
   EAttribute getMangoValueList_Name();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues
-   * <em>Values</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues <em>Values</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference list '<em>Values</em>'.
    * @see org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues()
    * @see #getMangoValueList()
@@ -207,9 +200,8 @@ public interface MangoPackage extends EPackage
   EClass getMangoValue();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValue#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.mango.MangoValue#getName()
    * @see #getMangoValue()
@@ -228,9 +220,8 @@ public interface MangoPackage extends EPackage
   EClass getMangoParameter();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#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.mango.MangoParameter#getName()
    * @see #getMangoParameter()
@@ -239,9 +230,8 @@ public interface MangoPackage extends EPackage
   EAttribute getMangoParameter_Name();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing
-   * <em>Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Passing</em>'.
    * @see org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing()
    * @see #getMangoParameter()
@@ -250,9 +240,8 @@ public interface MangoPackage extends EPackage
   EAttribute getMangoParameter_Passing();
 
   /**
-   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing
-   * <em>Parameter Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for enum '<em>Parameter Passing</em>'.
    * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
    * @generated
@@ -260,8 +249,8 @@ public interface MangoPackage extends EPackage
   EEnum getParameterPassing();
 
   /**
-   * 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
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
index f8a721d0d5..a50d1c1896 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoParameter.java
@@ -14,30 +14,31 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Parameter</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}</li>
  * </ul>
  * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter()
+ *
+ * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter()
  * @model
  * @generated
  */
 public interface MangoParameter 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.mango.MangoPackage#getMangoParameter_Name()
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter_Name()
    * @model
    * @generated
    */
@@ -46,38 +47,34 @@ public interface MangoParameter extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Name</em>' attribute.
+   * @param value the new value of the '<em>Name</em>' attribute.
    * @see #getName()
    * @generated
    */
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Passing</b></em>' attribute. The literals are from the enumeration
-   * {@link org.eclipse.emf.cdo.tests.mango.ParameterPassing}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Passing</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.mango.ParameterPassing}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Passing</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Passing</em>' attribute.
    * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
    * @see #setPassing(ParameterPassing)
-   * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoParameter_Passing()
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoParameter_Passing()
    * @model
    * @generated
    */
   ParameterPassing getPassing();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Passing</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Passing</em>' attribute.
    * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
    * @see #getPassing()
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
index 3a555ba322..9fe321a610 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValue.java
@@ -14,29 +14,30 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Value</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValue()
+ *
+ * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValue()
  * @model
  * @generated
  */
 public interface MangoValue 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.mango.MangoPackage#getMangoValue_Name()
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValue_Name()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
index 07da3c2cef..d50cdfd669 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoValueList.java
@@ -15,30 +15,31 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Value List</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues <em>Values</em>}</li>
  * </ul>
  * </p>
- * 
- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList()
+ *
+ * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList()
  * @model
  * @generated
  */
 public interface MangoValueList 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.mango.MangoPackage#getMangoValueList_Name()
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList_Name()
    * @model
    * @generated
    */
@@ -47,25 +48,23 @@ public interface MangoValueList extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Name</em>' attribute.
+   * @param value the new value of the '<em>Name</em>' attribute.
    * @see #getName()
    * @generated
    */
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Values</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.mango.MangoValue}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Values</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.mango.MangoValue}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Values</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>Values</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getMangoValueList_Values()
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getMangoValueList_Values()
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
index c9b604768d..a7ef203bc7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/ParameterPassing.java
@@ -19,16 +19,15 @@ import java.util.List;
 /**
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Parameter Passing</b></em>', and
  * utility methods for working with them. <!-- end-user-doc -->
- * 
- * @see org.eclipse.emf.cdo.tests.mango.MangoPackage#getParameterPassing()
+ * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage#getParameterPassing()
  * @model
  * @generated
  */
 public enum ParameterPassing implements Enumerator
 {
   /**
-   * The '<em><b>By Value</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>By Value</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #BY_VALUE_VALUE
    * @generated
    * @ordered
@@ -36,8 +35,8 @@ public enum ParameterPassing implements Enumerator
   BY_VALUE(0, "ByValue", "ByValue"),
 
   /**
-   * The '<em><b>By Reference</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>By Reference</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #BY_REFERENCE_VALUE
    * @generated
    * @ordered
@@ -45,13 +44,13 @@ public enum ParameterPassing implements Enumerator
   BY_REFERENCE(1, "ByReference", "ByReference");
 
   /**
-   * The '<em><b>By Value</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>By Value</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>By Value</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #BY_VALUE
    * @model name="ByValue"
    * @generated
@@ -60,13 +59,13 @@ public enum ParameterPassing implements Enumerator
   public static final int BY_VALUE_VALUE = 0;
 
   /**
-   * The '<em><b>By Reference</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>By Reference</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>By Reference</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #BY_REFERENCE
    * @model name="ByReference"
    * @generated
@@ -75,24 +74,24 @@ public enum ParameterPassing implements Enumerator
   public static final int BY_REFERENCE_VALUE = 1;
 
   /**
-   * An array of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * An array of all the '<em><b>Parameter Passing</b></em>' enumerators.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private static final ParameterPassing[] VALUES_ARRAY = new ParameterPassing[] { BY_VALUE, BY_REFERENCE, };
 
   /**
-   * A public read-only list of all the '<em><b>Parameter Passing</b></em>' enumerators. <!-- begin-user-doc --> <!--
+   * A public read-only list of all the '<em><b>Parameter Passing</b></em>' enumerators.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static final List<ParameterPassing> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
   /**
-   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified literal value. <!-- begin-user-doc -->
+   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static ParameterPassing get(String literal)
@@ -109,9 +108,9 @@ public enum ParameterPassing implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified name.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static ParameterPassing getByName(String name)
@@ -128,9 +127,9 @@ public enum ParameterPassing implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified integer value. <!-- begin-user-doc -->
+   * Returns the '<em><b>Parameter Passing</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static ParameterPassing get(int value)
@@ -147,28 +146,25 @@ public enum ParameterPassing implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final int value;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final String name;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final String literal;
 
   /**
-   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Only this class can construct instances.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private ParameterPassing(int value, String name, String literal)
@@ -180,7 +176,6 @@ public enum ParameterPassing implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public int getValue()
@@ -190,7 +185,6 @@ public enum ParameterPassing implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -200,7 +194,6 @@ public enum ParameterPassing implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getLiteral()
@@ -209,9 +202,9 @@ public enum ParameterPassing implements Enumerator
   }
 
   /**
-   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
index 538881a8fb..2d8de16a9a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java
@@ -4,12 +4,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
 package org.eclipse.emf.cdo.tests.mango.impl;
 
+//import org.eclipse.emf.cdo.tests.mango.*;
 import org.eclipse.emf.cdo.tests.mango.MangoFactory;
 import org.eclipse.emf.cdo.tests.mango.MangoPackage;
 import org.eclipse.emf.cdo.tests.mango.MangoParameter;
@@ -26,14 +27,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 {
   /**
-   * 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 MangoFactory init()
@@ -55,8 +55,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
   }
 
   /**
-   * 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 MangoFactoryImpl()
@@ -66,7 +66,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -87,7 +86,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +102,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -121,7 +118,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MangoValueList createMangoValueList()
@@ -132,7 +128,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MangoValue createMangoValue()
@@ -143,7 +138,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MangoParameter createMangoParameter()
@@ -154,21 +148,21 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ParameterPassing createParameterPassingFromString(EDataType eDataType, String initialValue)
   {
     ParameterPassing result = ParameterPassing.get(initialValue);
     if (result == null)
+    {
       throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
           + eDataType.getName() + "'");
+    }
     return result;
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String convertParameterPassingToString(EDataType eDataType, Object instanceValue)
@@ -178,7 +172,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MangoPackage getMangoPackage()
@@ -188,7 +181,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
index 0c3004447a..989b54386c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
@@ -26,35 +26,30 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass mangoValueListEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass mangoValueEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass mangoParameterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EEnum parameterPassingEEnum = null;
@@ -79,18 +74,17 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- 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 MangoPackage#eINSTANCE} when that field is accessed. Clients should not
-   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -123,7 +117,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getMangoValueList()
@@ -133,7 +126,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoValueList_Name()
@@ -143,7 +135,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getMangoValueList_Values()
@@ -153,7 +144,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getMangoValue()
@@ -163,7 +153,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoValue_Name()
@@ -173,7 +162,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getMangoParameter()
@@ -183,7 +171,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoParameter_Name()
@@ -193,7 +180,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoParameter_Passing()
@@ -203,7 +189,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EEnum getParameterPassing()
@@ -213,7 +198,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MangoFactory getMangoFactory()
@@ -223,15 +207,14 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- 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()
@@ -258,15 +241,14 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- 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.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java
index 747a8b1ed5..c9d064a718 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java
@@ -23,18 +23,17 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected MangoParameterImpl()
@@ -44,7 +43,6 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -55,7 +53,6 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -66,7 +63,6 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -76,7 +72,6 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -86,7 +81,6 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ParameterPassing getPassing()
@@ -96,7 +90,6 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPassing(ParameterPassing newPassing)
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java
index e7fc5b8f7e..afd321a108 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java
@@ -22,17 +22,16 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MangoValueImpl extends CDOObjectImpl implements MangoValue
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected MangoValueImpl()
@@ -42,7 +41,6 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -53,7 +51,6 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -64,7 +61,6 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -74,7 +70,6 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java
index c66d50bb62..14157f1374 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java
@@ -24,18 +24,17 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl#getValues <em>Values</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected MangoValueListImpl()
@@ -45,7 +44,6 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -56,7 +54,6 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -67,7 +64,6 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -77,7 +73,6 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -87,7 +82,6 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/MangoFactory.java
index 2c59237ae7..5c1aea174e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/MangoFactory.java
@@ -4,59 +4,61 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango;
+package org.eclipse.emf.cdo.tests.mango.legacy;
 
 import org.eclipse.emf.cdo.tests.mango.MangoParameter;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
 import org.eclipse.emf.cdo.tests.mango.MangoValueList;
+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.legacy.mango.MangoPackage
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model. It provides a create method for each non-abstract class of the model.
+ * @extends org.eclipse.emf.cdo.tests.mango.MangoFactory
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage
  * @generated
  */
-public interface MangoFactory extends org.eclipse.emf.cdo.tests.mango.MangoFactory
+public interface MangoFactory extends EFactory, org.eclipse.emf.cdo.tests.mango.MangoFactory
 {
   /**
-   * 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
    */
-  MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.init();
+  MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Value List</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Value List</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Value List</em>'.
    * @generated
    */
   MangoValueList createMangoValueList();
 
   /**
-   * Returns a new object of class '<em>Value</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Value</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Value</em>'.
    * @generated
    */
   MangoValue createMangoValue();
 
   /**
-   * Returns a new object of class '<em>Parameter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Parameter</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Parameter</em>'.
    * @generated
    */
   MangoParameter createMangoParameter();
 
   /**
-   * 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.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/MangoPackage.java
index df8f8fe567..b3c91c0c08 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/MangoPackage.java
@@ -4,15 +4,16 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango;
+package org.eclipse.emf.cdo.tests.mango.legacy;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
 /**
@@ -23,174 +24,167 @@ import org.eclipse.emf.ecore.EReference;
  * <li>each enum,</li>
  * <li>and each data type</li>
  * </ul>
+ * @extends org.eclipse.emf.cdo.tests.mango.MangoPackage
  * <!-- end-user-doc -->
- * 
- * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory
+ * @see org.eclipse.emf.cdo.tests.mango.legacy.MangoFactory
  * @model kind="package"
  * @generated
  */
-public interface MangoPackage extends org.eclipse.emf.cdo.tests.mango.MangoPackage
+public interface MangoPackage extends EPackage, org.eclipse.emf.cdo.tests.mango.MangoPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "mango";
 
   /**
-   * 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/legacy/mango";
+  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/mango";
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "mango";
 
   /**
-   * 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
    */
-  MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.init();
+  MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl
-   * <em>Value List</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getMangoValueList()
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueListImpl <em>Value List</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueListImpl
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl#getMangoValueList()
    * @generated
    */
   int MANGO_VALUE_LIST = 0;
 
   /**
-   * 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
    */
   int MANGO_VALUE_LIST__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Values</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Values</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_VALUE_LIST__VALUES = 1;
 
   /**
-   * The number of structural features of the '<em>Value List</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Value List</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_VALUE_LIST_FEATURE_COUNT = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl <em>Value</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getMangoValue()
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueImpl <em>Value</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueImpl
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl#getMangoValue()
    * @generated
    */
   int MANGO_VALUE = 1;
 
   /**
-   * 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
    */
   int MANGO_VALUE__NAME = 0;
 
   /**
-   * The number of structural features of the '<em>Value</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Value</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_VALUE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl
-   * <em>Parameter</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getMangoParameter()
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoParameterImpl <em>Parameter</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoParameterImpl
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl#getMangoParameter()
    * @generated
    */
   int MANGO_PARAMETER = 2;
 
   /**
-   * 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
    */
   int MANGO_PARAMETER__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Passing</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Passing</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_PARAMETER__PASSING = 1;
 
   /**
-   * The number of structural features of the '<em>Parameter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Parameter</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int MANGO_PARAMETER_FEATURE_COUNT = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing
-   * <em>Parameter Passing</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getParameterPassing()
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}' enum.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
+   * @see org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl#getParameterPassing()
    * @generated
    */
   int PARAMETER_PASSING = 3;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList
-   * <em>Value List</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList <em>Value List</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Value List</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList
+   * @see org.eclipse.emf.cdo.tests.mango.MangoValueList
    * @generated
    */
   EClass getMangoValueList();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getName <em>Name</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getName()
+   * @see org.eclipse.emf.cdo.tests.mango.MangoValueList#getName()
    * @see #getMangoValueList()
    * @generated
    */
   EAttribute getMangoValueList_Name();
 
   /**
-   * Returns the meta object for the reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getValues <em>Values</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues <em>Values</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the reference list '<em>Values</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getValues()
+   * @see org.eclipse.emf.cdo.tests.mango.MangoValueList#getValues()
    * @see #getMangoValueList()
    * @generated
    */
@@ -199,7 +193,7 @@ public interface MangoPackage extends org.eclipse.emf.cdo.tests.mango.MangoPacka
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValue <em>Value</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Value</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValue
    * @generated
@@ -207,61 +201,56 @@ public interface MangoPackage extends org.eclipse.emf.cdo.tests.mango.MangoPacka
   EClass getMangoValue();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValue#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoValue#getName <em>Name</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValue#getName()
+   * @see org.eclipse.emf.cdo.tests.mango.MangoValue#getName()
    * @see #getMangoValue()
    * @generated
    */
   EAttribute getMangoValue_Name();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter <em>Parameter</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter <em>Parameter</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Parameter</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter
+   * @see org.eclipse.emf.cdo.tests.mango.MangoParameter
    * @generated
    */
   EClass getMangoParameter();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getName <em>Name</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getName()
+   * @see org.eclipse.emf.cdo.tests.mango.MangoParameter#getName()
    * @see #getMangoParameter()
    * @generated
    */
   EAttribute getMangoParameter_Name();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getPassing
-   * <em>Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing <em>Passing</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Passing</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getPassing()
+   * @see org.eclipse.emf.cdo.tests.mango.MangoParameter#getPassing()
    * @see #getMangoParameter()
    * @generated
    */
   EAttribute getMangoParameter_Passing();
 
   /**
-   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing
-   * <em>Parameter Passing</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing <em>Parameter Passing</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for enum '<em>Parameter Passing</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing
+   * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing
    * @generated
    */
   EEnum getParameterPassing();
 
   /**
-   * 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
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
index d3781d3e7e..b7b3340c1b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoFactoryImpl.java
@@ -8,14 +8,15 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango.impl;
+package org.eclipse.emf.cdo.tests.mango.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory;
-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage;
+//import org.eclipse.emf.cdo.tests.mango.*;
 import org.eclipse.emf.cdo.tests.mango.MangoParameter;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
 import org.eclipse.emf.cdo.tests.mango.MangoValueList;
 import org.eclipse.emf.cdo.tests.mango.ParameterPassing;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoFactory;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -26,7 +27,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- *
  * @generated
  */
 public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
@@ -34,7 +34,7 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
   /**
    * @ADDED
    */
-  public static final MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.init();
+  public static final MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoFactoryImpl.init();
 
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -64,8 +64,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
   }
 
   /**
-   * 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 MangoFactoryImpl()
@@ -75,7 +75,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   @Override
@@ -96,7 +95,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   @Override
@@ -113,7 +111,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   @Override
@@ -130,7 +127,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   public MangoValueList createMangoValueList()
@@ -141,7 +137,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   public MangoValue createMangoValue()
@@ -152,7 +147,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   public MangoParameter createMangoParameter()
@@ -163,7 +157,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   public ParameterPassing createParameterPassingFromString(EDataType eDataType, String initialValue)
@@ -179,7 +172,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   public String convertParameterPassingToString(EDataType eDataType, Object instanceValue)
@@ -189,7 +181,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @generated
    */
   public MangoPackage getMangoPackage()
@@ -199,7 +190,6 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   *
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
index d74f0e9534..648719ff8c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoPackageImpl.java
@@ -8,14 +8,14 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango.impl;
+package org.eclipse.emf.cdo.tests.mango.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory;
-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage;
 import org.eclipse.emf.cdo.tests.mango.MangoParameter;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
 import org.eclipse.emf.cdo.tests.mango.MangoValueList;
 import org.eclipse.emf.cdo.tests.mango.ParameterPassing;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoFactory;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -26,7 +26,6 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class MangoPackageImpl extends EPackageImpl implements MangoPackage
@@ -34,32 +33,28 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
   /**
    * @ADDED
    */
-  public static final MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.init();
+  public static final MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl.init();
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass mangoValueListEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass mangoValueEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass mangoParameterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EEnum parameterPassingEEnum = null;
@@ -84,18 +79,17 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- 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 MangoPackage#eINSTANCE} when that field is accessed. Clients should not
-   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link MangoPackage#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -128,7 +122,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getMangoValueList()
@@ -138,7 +131,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoValueList_Name()
@@ -148,7 +140,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getMangoValueList_Values()
@@ -158,7 +149,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getMangoValue()
@@ -168,7 +158,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoValue_Name()
@@ -178,7 +167,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getMangoParameter()
@@ -188,7 +176,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoParameter_Name()
@@ -198,7 +185,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getMangoParameter_Passing()
@@ -208,7 +194,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EEnum getParameterPassing()
@@ -218,7 +203,6 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MangoFactory getMangoFactory()
@@ -228,15 +212,14 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- 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()
@@ -263,15 +246,14 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
 
   /**
    * <!-- 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.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
index 73f8c38891..176fc78bd4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoParameterImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango.impl;
+package org.eclipse.emf.cdo.tests.mango.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage;
 import org.eclipse.emf.cdo.tests.mango.MangoParameter;
 import org.eclipse.emf.cdo.tests.mango.ParameterPassing;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoParameterImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoParameterImpl#getPassing <em>Passing</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MangoParameterImpl extends EObjectImpl implements MangoParameter
@@ -44,8 +44,8 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -53,9 +53,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   protected String name = NAME_EDEFAULT;
 
   /**
-   * The default value of the '{@link #getPassing() <em>Passing</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getPassing() <em>Passing</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPassing()
    * @generated
    * @ordered
@@ -63,9 +63,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
   protected static final ParameterPassing PASSING_EDEFAULT = ParameterPassing.BY_VALUE;
 
   /**
-   * The cached value of the '{@link #getPassing() <em>Passing</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getPassing() <em>Passing</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPassing()
    * @generated
    * @ordered
@@ -74,7 +74,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected MangoParameterImpl()
@@ -84,7 +83,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -95,7 +93,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -105,7 +102,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -118,7 +114,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ParameterPassing getPassing()
@@ -128,7 +123,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPassing(ParameterPassing newPassing)
@@ -141,7 +135,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -159,7 +152,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -179,7 +171,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -199,7 +190,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -217,7 +207,6 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueImpl.java
index 2e47920796..61911ad406 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango.impl;
+package org.eclipse.emf.cdo.tests.mango.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MangoValueImpl extends EObjectImpl implements MangoValue
@@ -42,8 +42,8 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
   protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -52,7 +52,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected MangoValueImpl()
@@ -62,7 +61,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +71,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -83,7 +80,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -96,7 +92,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -112,7 +107,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -129,7 +123,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -146,7 +139,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -162,7 +154,6 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueListImpl.java
index ac768331ec..5926cd96a5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/impl/MangoValueListImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.mango.impl;
+package org.eclipse.emf.cdo.tests.mango.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.mango.MangoPackage;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
 import org.eclipse.emf.cdo.tests.mango.MangoValueList;
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
@@ -28,11 +28,11 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueListImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoValueListImpl#getValues <em>Values</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MangoValueListImpl extends EObjectImpl implements MangoValueList
@@ -40,7 +40,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -48,8 +48,8 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
   protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -57,9 +57,9 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
   protected String name = NAME_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getValues() <em>Values</em>}' reference list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getValues() <em>Values</em>}' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getValues()
    * @generated
    * @ordered
@@ -68,7 +68,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected MangoValueListImpl()
@@ -78,7 +77,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -89,7 +87,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -99,7 +96,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -112,7 +108,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<MangoValue> getValues()
@@ -126,7 +121,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -144,7 +138,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -166,7 +159,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -186,7 +178,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -204,7 +195,6 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
new file mode 100644
index 0000000000..bc90131356
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoAdapterFactory.java
@@ -0,0 +1,183 @@
+/**
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.mango.legacy.util;
+
+import org.eclipse.emf.cdo.tests.mango.*;
+
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+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.mango.legacy.MangoPackage
+ * @generated
+ */
+public class MangoAdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * The cached model package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static MangoPackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public MangoAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = MangoPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
+
+  /**
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected MangoSwitch<Adapter> modelSwitch = new MangoSwitch<Adapter>()
+  {
+    @Override
+    public Adapter caseMangoValueList(MangoValueList object)
+    {
+      return createMangoValueListAdapter();
+    }
+
+    @Override
+    public Adapter caseMangoValue(MangoValue object)
+    {
+      return createMangoValueAdapter();
+    }
+
+    @Override
+    public Adapter caseMangoParameter(MangoParameter object)
+    {
+      return createMangoParameterAdapter();
+    }
+
+    @Override
+    public Adapter defaultCase(EObject object)
+    {
+      return createEObjectAdapter();
+    }
+  };
+
+  /**
+   * 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
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList <em>Value List</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.mango.MangoValueList
+   * @generated
+   */
+  public Adapter createMangoValueListAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoValue <em>Value</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.mango.MangoValue
+   * @generated
+   */
+  public Adapter createMangoValueAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter <em>Parameter</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.mango.MangoParameter
+   * @generated
+   */
+  public Adapter createMangoParameterAdapter()
+  {
+    return 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
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} //MangoAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
new file mode 100644
index 0000000000..7508f4e30d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/legacy/util/MangoSwitch.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.mango.legacy.util;
+
+import java.util.List;
+
+import org.eclipse.emf.cdo.tests.mango.*;
+
+import org.eclipse.emf.cdo.tests.mango.legacy.MangoPackage;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@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.mango.legacy.MangoPackage
+ * @generated
+ */
+public class MangoSwitch<T>
+{
+  /**
+   * The cached model package
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected static MangoPackage modelPackage;
+
+  /**
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public MangoSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = MangoPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  public T doSwitch(EObject theEObject)
+  {
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+    case MangoPackage.MANGO_VALUE_LIST:
+    {
+      MangoValueList mangoValueList = (MangoValueList)theEObject;
+      T result = caseMangoValueList(mangoValueList);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case MangoPackage.MANGO_VALUE:
+    {
+      MangoValue mangoValue = (MangoValue)theEObject;
+      T result = caseMangoValue(mangoValue);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case MangoPackage.MANGO_PARAMETER:
+    {
+      MangoParameter mangoParameter = (MangoParameter)theEObject;
+      T result = caseMangoParameter(mangoParameter);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    default:
+      return defaultCase(theEObject);
+    }
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Value List</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Value List</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMangoValueList(MangoValueList object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Value</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Value</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMangoValue(MangoValue object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseMangoParameter(MangoParameter object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch, but this is the last case anyway.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} //MangoSwitch
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
index 7b6a53682e..6127e29f46 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoAdapterFactory.java
@@ -4,12 +4,13 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
 package org.eclipse.emf.cdo.tests.mango.util;
 
+//import org.eclipse.emf.cdo.tests.mango.*;
 import org.eclipse.emf.cdo.tests.mango.MangoPackage;
 import org.eclipse.emf.cdo.tests.mango.MangoParameter;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
@@ -23,22 +24,21 @@ 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.mango.MangoPackage
  * @generated
  */
 public class MangoAdapterFactory 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 MangoPackage 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 MangoAdapterFactory()
@@ -50,10 +50,10 @@ public class MangoAdapterFactory 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
    */
@@ -72,8 +72,8 @@ public class MangoAdapterFactory 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 MangoSwitch<Adapter> modelSwitch = new MangoSwitch<Adapter>()
@@ -104,10 +104,9 @@ public class MangoAdapterFactory 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
    */
@@ -118,10 +117,9 @@ public class MangoAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoValueList
-   * <em>Value List</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.mango.MangoValueList <em>Value List</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.mango.MangoValueList
    * @generated
@@ -135,7 +133,6 @@ public class MangoAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoValue <em>Value</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.mango.MangoValue
    * @generated
@@ -146,10 +143,9 @@ public class MangoAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter
-   * <em>Parameter</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.mango.MangoParameter <em>Parameter</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.mango.MangoParameter
    * @generated
@@ -160,9 +156,9 @@ public class MangoAdapterFactory 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.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
index ff33a2b529..003b46aafe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -20,27 +20,28 @@ import org.eclipse.emf.ecore.EObject;
 
 import java.util.List;
 
+//import org.eclipse.emf.cdo.tests.mango.*;
+
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
  * {@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.mango.MangoPackage
  * @generated
  */
 public class MangoSwitch<T>
 {
   /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static MangoPackage 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 MangoSwitch()
@@ -54,7 +55,6 @@ public class MangoSwitch<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
    */
@@ -66,7 +66,6 @@ public class MangoSwitch<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
    */
@@ -86,7 +85,6 @@ public class MangoSwitch<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
    */
@@ -130,11 +128,10 @@ public class MangoSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Value List</em>'. <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Value List</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>Value List</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -145,11 +142,10 @@ public class MangoSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Value</em>'. <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Value</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>Value</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -160,11 +156,10 @@ public class MangoSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'. <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Parameter</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>Parameter</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -175,12 +170,11 @@ public class MangoSwitch<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