Attachment 155182 Details for Bug 247226 – Legacy Tests Patch v4

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Legacy Tests Patch v4

PATCH_Legacy_Tests.txt (text/plain), 1.02 MB, created by Martin Fluegge

on 2010-01-03 05:00:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Fluegge

Created: 2010-01-03 05:00:27 EST

Size: 1.02 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.cdo.tests.model4
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4Package.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java	3 Jan 2010 09:57:41 -0000
>@@ -16,7 +16,6 @@
> 
> import org.eclipse.emf.ecore.EAttribute;
> import org.eclipse.emf.ecore.EClass;
>-import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EReference;
> 
> /**
>@@ -28,45 +27,43 @@
> * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Factory
> * @model kind="package"
> * @generated
> */
>-public interface model4Package extends EPackage
>+public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Package
> {
> /**
>- * The package name.  
>- * 
>+ * The package name.
>+ *  
> * @generated
> */
> String eNAME = "model4";
> 
> /**
>- * The package namespace URI.  
>- * 
>- * @generated
>+ * The package namespace URI.
>+ *  
>+ * @generated NOT
> */
>- String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model4/1.0.0";
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model4/1.0.0";
> 
> /**
>- * The package namespace name.  
>- * 
>+ * The package namespace name.
>+ *  
> * @generated
> */
> String eNS_PREFIX = "model4";
> 
> /**
>- * The singleton instance of the package.  
>- * 
>+ * The singleton instance of the package.
>+ *  
> * @generated
> */
> model4Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl.init();
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
>- * Ref Single Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl Ref Single Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContained()
> * @generated
>@@ -83,18 +80,17 @@
> int REF_SINGLE_CONTAINED__ELEMENT = 0;
> 
> /**
>- * The number of structural features of the 'Ref Single Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_SINGLE_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
>- * Single Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl Single Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleContainedElement()
> * @generated
>@@ -102,34 +98,33 @@
> int SINGLE_CONTAINED_ELEMENT = 1;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int SINGLE_CONTAINED_ELEMENT__NAME = 0;
> 
> /**
>- * The feature id for the 'Parent' container reference.  
>- * 
>+ * The feature id for the 'Parent' container reference.
>+ *  
> * @generated
> * @ordered
> */
> int SINGLE_CONTAINED_ELEMENT__PARENT = 1;
> 
> /**
>- * The number of structural features of the 'Single Contained Element' class.   
>- * 
> * @generated
> * @ordered
> */
> int SINGLE_CONTAINED_ELEMENT_FEATURE_COUNT = 2;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
>- * Ref Single Non Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl Ref Single Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContained()
> * @generated
>@@ -137,26 +132,25 @@
> int REF_SINGLE_NON_CONTAINED = 2;
> 
> /**
>- * The feature id for the 'Element' reference.  
>- * 
>+ * The feature id for the 'Element' reference.
>+ *  
> * @generated
> * @ordered
> */
> int REF_SINGLE_NON_CONTAINED__ELEMENT = 0;
> 
> /**
>- * The number of structural features of the 'Ref Single Non Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_SINGLE_NON_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
>- * Single Non Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl Single Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleNonContainedElement()
> * @generated
>@@ -164,34 +158,33 @@
> int SINGLE_NON_CONTAINED_ELEMENT = 3;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int SINGLE_NON_CONTAINED_ELEMENT__NAME = 0;
> 
> /**
>- * The feature id for the 'Parent' reference.  
>- * 
>+ * The feature id for the 'Parent' reference.
>+ *  
> * @generated
> * @ordered
> */
> int SINGLE_NON_CONTAINED_ELEMENT__PARENT = 1;
> 
> /**
>- * The number of structural features of the 'Single Non Contained Element' class. 
>+ * The number of structural features of the 'Single Non Contained Element' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int SINGLE_NON_CONTAINED_ELEMENT_FEATURE_COUNT = 2;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
>- * Ref Multi Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl Ref Multi Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContained()
> * @generated
>@@ -199,27 +192,26 @@
> int REF_MULTI_CONTAINED = 4;
> 
> /**
>- * The feature id for the 'Elements' containment reference list.   
>- * 
> * @generated
> * @ordered
> */
> int REF_MULTI_CONTAINED__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Ref Multi Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_MULTI_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
>- * Multi Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl Multi Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiContainedElement()
> * @generated
>@@ -227,34 +219,33 @@
> int MULTI_CONTAINED_ELEMENT = 5;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int MULTI_CONTAINED_ELEMENT__NAME = 0;
> 
> /**
>- * The feature id for the 'Parent' container reference.  
>- * 
>+ * The feature id for the 'Parent' container reference.
>+ *  
> * @generated
> * @ordered
> */
> int MULTI_CONTAINED_ELEMENT__PARENT = 1;
> 
> /**
>- * The number of structural features of the 'Multi Contained Element' class.   
>- * 
> * @generated
> * @ordered
> */
> int MULTI_CONTAINED_ELEMENT_FEATURE_COUNT = 2;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
>- * Ref Multi Non Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl Ref Multi Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContained()
> * @generated
>@@ -262,26 +253,25 @@
> int REF_MULTI_NON_CONTAINED = 6;
> 
> /**
>- * The feature id for the 'Elements' reference list.  
>- * 
>+ * The feature id for the 'Elements' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int REF_MULTI_NON_CONTAINED__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Ref Multi Non Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_MULTI_NON_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
>- * Multi Non Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl Multi Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedElement()
> * @generated
>@@ -289,34 +279,33 @@
> int MULTI_NON_CONTAINED_ELEMENT = 7;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int MULTI_NON_CONTAINED_ELEMENT__NAME = 0;
> 
> /**
>- * The feature id for the 'Parent' reference.  
>- * 
>+ * The feature id for the 'Parent' reference.
>+ *  
> * @generated
> * @ordered
> */
> int MULTI_NON_CONTAINED_ELEMENT__PARENT = 1;
> 
> /**
>- * The number of structural features of the 'Multi Non Contained Element' class.   
>- * 
> * @generated
> * @ordered
> */
> int MULTI_NON_CONTAINED_ELEMENT_FEATURE_COUNT = 2;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
>- * Ref Single Contained NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl Ref Single Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContainedNPL()
> * @generated
>@@ -333,18 +322,17 @@
> int REF_SINGLE_CONTAINED_NPL__ELEMENT = 0;
> 
> /**
>- * The number of structural features of the 'Ref Single Contained NPL' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_SINGLE_CONTAINED_NPL_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
>- * Ref Single Non Contained NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl Ref Single Non Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL()
> * @generated
>@@ -352,26 +340,25 @@
> int REF_SINGLE_NON_CONTAINED_NPL = 9;
> 
> /**
>- * The feature id for the 'Element' reference.  
>- * 
>+ * The feature id for the 'Element' reference.
>+ *  
> * @generated
> * @ordered
> */
> int REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = 0;
> 
> /**
>- * The number of structural features of the 'Ref Single Non Contained NPL' class. 
>+ * The number of structural features of the 'Ref Single Non Contained NPL' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int REF_SINGLE_NON_CONTAINED_NPL_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
>- * Ref Multi Contained NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl Ref Multi Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContainedNPL()
> * @generated
>@@ -379,27 +366,26 @@
> int REF_MULTI_CONTAINED_NPL = 10;
> 
> /**
>- * The feature id for the 'Elements' containment reference list.   
>- * 
> * @generated
> * @ordered
> */
> int REF_MULTI_CONTAINED_NPL__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Ref Multi Contained NPL' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_MULTI_CONTAINED_NPL_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
>- * Ref Multi Non Contained NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl Ref Multi Non Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL()
> * @generated
>@@ -407,26 +393,25 @@
> int REF_MULTI_NON_CONTAINED_NPL = 11;
> 
> /**
>- * The feature id for the 'Elements' reference list.  
>- * 
>+ * The feature id for the 'Elements' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Ref Multi Non Contained NPL' class.   
>- * 
> * @generated
> * @ordered
> */
> int REF_MULTI_NON_CONTAINED_NPL_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
>- * Contained Element No Opposite}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl Contained Element No Opposite}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getContainedElementNoOpposite()
> * @generated
>@@ -434,26 +419,25 @@
> int CONTAINED_ELEMENT_NO_OPPOSITE = 12;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int CONTAINED_ELEMENT_NO_OPPOSITE__NAME = 0;
> 
> /**
>- * The number of structural features of the 'Contained Element No Opposite' class. 
>+ * The number of structural features of the 'Contained Element No Opposite' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int CONTAINED_ELEMENT_NO_OPPOSITE_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
>- * Gen Ref Single Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl Gen Ref Single Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleContained()
> * @generated
>@@ -470,18 +454,17 @@
> int GEN_REF_SINGLE_CONTAINED__ELEMENT = 0;
> 
> /**
>- * The number of structural features of the 'Gen Ref Single Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_SINGLE_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
>- * Gen Ref Single Non Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl Gen Ref Single Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleNonContained()
> * @generated
>@@ -489,26 +472,25 @@
> int GEN_REF_SINGLE_NON_CONTAINED = 14;
> 
> /**
>- * The feature id for the 'Element' reference.  
>- * 
>+ * The feature id for the 'Element' reference.
>+ *  
> * @generated
> * @ordered
> */
> int GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = 0;
> 
> /**
>- * The number of structural features of the 'Gen Ref Single Non Contained' class. 
>+ * The number of structural features of the 'Gen Ref Single Non Contained' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_SINGLE_NON_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
>- * Gen Ref Multi Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl Gen Ref Multi Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiContained()
> * @generated
>@@ -516,27 +498,26 @@
> int GEN_REF_MULTI_CONTAINED = 15;
> 
> /**
>- * The feature id for the 'Elements' containment reference list.   
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_MULTI_CONTAINED__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Gen Ref Multi Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_MULTI_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
>- * Gen Ref Multi Non Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl Gen Ref Multi Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNonContained()
> * @generated
>@@ -544,26 +525,25 @@
> int GEN_REF_MULTI_NON_CONTAINED = 16;
> 
> /**
>- * The feature id for the 'Elements' reference list.  
>- * 
>+ * The feature id for the 'Elements' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Gen Ref Multi Non Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_MULTI_NON_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
>- * Impl Single Ref Container}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl Impl Single Ref Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainer()
> * @generated
>@@ -580,18 +560,17 @@
> int IMPL_SINGLE_REF_CONTAINER__ELEMENT = model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT;
> 
> /**
>- * The number of structural features of the 'Impl Single Ref Container' class.   
>- * 
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_CONTAINER_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINER_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
>- * Impl Single Ref Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl Impl Single Ref Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainedElement()
> * @generated
>@@ -599,34 +578,33 @@
> int IMPL_SINGLE_REF_CONTAINED_ELEMENT = 18;
> 
> /**
>- * The feature id for the 'Parent' container reference.  
>- * 
>+ * The feature id for the 'Parent' container reference.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
> 
> /**
>- * The number of structural features of the 'Impl Single Ref Contained Element' class.  
>- * 
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
>- * Impl Single Ref Non Container}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl Impl Single Ref Non Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainer()
> * @generated
>@@ -634,27 +612,25 @@
> int IMPL_SINGLE_REF_NON_CONTAINER = 19;
> 
> /**
>- * The feature id for the 'Element' reference.  
>- * 
>+ * The feature id for the 'Element' reference.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT;
> 
> /**
>- * The number of structural features of the 'Impl Single Ref Non Container' class. 
>+ * The number of structural features of the 'Impl Single Ref Non Container' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_NON_CONTAINER_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
>- * Impl Single Ref Non Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl Impl Single Ref Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement()
> * @generated
>@@ -662,16 +638,16 @@
> int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT = 20;
> 
> /**
>- * The feature id for the 'Parent' reference.  
>- * 
>+ * The feature id for the 'Parent' reference.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
>@@ -687,9 +663,8 @@
> int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
>- * Impl Multi Ref Non Container}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl Impl Multi Ref Non Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainer()
> * @generated
>@@ -697,27 +672,25 @@
> int IMPL_MULTI_REF_NON_CONTAINER = 21;
> 
> /**
>- * The feature id for the 'Elements' reference list.  
>- * 
>+ * The feature id for the 'Elements' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINER__ELEMENTS = model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS;
> 
> /**
>- * The number of structural features of the 'Impl Multi Ref Non Container' class. 
>+ * The number of structural features of the 'Impl Multi Ref Non Container' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINER_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
>- * Impl Multi Ref Non Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl Impl Multi Ref Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement()
> * @generated
>@@ -725,34 +698,33 @@
> int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT = 22;
> 
> /**
>- * The feature id for the 'Parent' reference.  
>- * 
>+ * The feature id for the 'Parent' reference.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
> 
> /**
>- * The number of structural features of the 'Impl Multi Ref Non Contained Element' class.  
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
>- * Impl Multi Ref Container}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl Impl Multi Ref Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainer()
> * @generated
>@@ -760,27 +732,26 @@
> int IMPL_MULTI_REF_CONTAINER = 23;
> 
> /**
>- * The feature id for the 'Elements' containment reference list.   
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINER__ELEMENTS = model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS;
> 
> /**
>- * The number of structural features of the 'Impl Multi Ref Container' class.   
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINER_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINER_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
>- * Impl Multi Ref Contained Element}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl Impl Multi Ref Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainedElement()
> * @generated
>@@ -788,34 +759,33 @@
> int IMPL_MULTI_REF_CONTAINED_ELEMENT = 24;
> 
> /**
>- * The feature id for the 'Parent' container reference.  
>- * 
>+ * The feature id for the 'Parent' container reference.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT__PARENT;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 0;
> 
> /**
>- * The number of structural features of the 'Impl Multi Ref Contained Element' class. 
>+ * The number of structural features of the 'Impl Multi Ref Contained Element' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
>- * Impl Single Ref Container NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl Impl Single Ref Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL()
> * @generated
>@@ -832,18 +802,17 @@
> int IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT = model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL__ELEMENT;
> 
> /**
>- * The number of structural features of the 'Impl Single Ref Container NPL' class. 
>+ * The number of structural features of the 'Impl Single Ref Container NPL' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
>- * Impl Single Ref Non Container NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl Impl Single Ref Non Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL()
> * @generated
>@@ -851,26 +820,25 @@
> int IMPL_SINGLE_REF_NON_CONTAINER_NPL = 26;
> 
> /**
>- * The feature id for the 'Element' reference.  
>- * 
>+ * The feature id for the 'Element' reference.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT;
> 
> /**
>- * The number of structural features of the 'Impl Single Ref Non Container NPL' class.  
>- * 
> * @generated
> * @ordered
> */
> int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
>- * Impl Multi Ref Container NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl Impl Multi Ref Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL()
> * @generated
>@@ -878,27 +846,26 @@
> int IMPL_MULTI_REF_CONTAINER_NPL = 27;
> 
> /**
>- * The feature id for the 'Elements' containment reference list.   
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINER_NPL__ELEMENTS = model4interfacesPackage.IMULTI_REF_CONTAINER_NPL__ELEMENTS;
> 
> /**
>- * The number of structural features of the 'Impl Multi Ref Container NPL' class. 
>+ * The number of structural features of the 'Impl Multi Ref Container NPL' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINER_NPL_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
>- * Impl Multi Ref Non Container NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl Impl Multi Ref Non Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL()
> * @generated
>@@ -906,26 +873,25 @@
> int IMPL_MULTI_REF_NON_CONTAINER_NPL = 28;
> 
> /**
>- * The feature id for the 'Elements' reference list.  
>- * 
>+ * The feature id for the 'Elements' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINER_NPL__ELEMENTS = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS;
> 
> /**
>- * The number of structural features of the 'Impl Multi Ref Non Container NPL' class. 
>+ * The number of structural features of the 'Impl Multi Ref Non Container NPL' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
>- * Impl Contained Element NPL}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl Impl Contained Element NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplContainedElementNPL()
> * @generated
>@@ -933,26 +899,25 @@
> int IMPL_CONTAINED_ELEMENT_NPL = 29;
> 
> /**
>- * The feature id for the 'Name' attribute.  
>- * 
>+ * The feature id for the 'Name' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int IMPL_CONTAINED_ELEMENT_NPL__NAME = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 0;
> 
> /**
>- * The number of structural features of the 'Impl Contained Element NPL' class.   
>- * 
> * @generated
> * @ordered
> */
> int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
>- * Gen Ref Multi NU Non Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl Gen Ref Multi NU Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained()
> * @generated
>@@ -960,26 +925,25 @@
> int GEN_REF_MULTI_NU_NON_CONTAINED = 30;
> 
> /**
>- * The feature id for the 'Elements' reference list.  
>- * 
>+ * The feature id for the 'Elements' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Gen Ref Multi NU Non Contained' class. 
>+ * The number of structural features of the 'Gen Ref Multi NU Non Contained' class.
>+ * 
> * 
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_MULTI_NU_NON_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
>- * Gen Ref Map Non Contained}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl Gen Ref Map Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMapNonContained()
> * @generated
>@@ -987,26 +951,25 @@
> int GEN_REF_MAP_NON_CONTAINED = 31;
> 
> /**
>- * The feature id for the 'Elements' map.  
>- * 
>+ * The feature id for the 'Elements' map.
>+ *  
> * @generated
> * @ordered
> */
> int GEN_REF_MAP_NON_CONTAINED__ELEMENTS = 0;
> 
> /**
>- * The number of structural features of the 'Gen Ref Map Non Contained' class.   
>- * 
> * @generated
> * @ordered
> */
> int GEN_REF_MAP_NON_CONTAINED_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
>- * String To EObject}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl String To EObject}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getStringToEObject()
> * @generated
>@@ -1014,34 +977,33 @@
> int STRING_TO_EOBJECT = 32;
> 
> /**
>- * The feature id for the 'Key' attribute.  
>- * 
>+ * The feature id for the 'Key' attribute.
>+ *  
> * @generated
> * @ordered
> */
> int STRING_TO_EOBJECT__KEY = 0;
> 
> /**
>- * The feature id for the 'Value' reference.  
>- * 
>+ * The feature id for the 'Value' reference.
>+ *  
> * @generated
> * @ordered
> */
> int STRING_TO_EOBJECT__VALUE = 1;
> 
> /**
>- * The number of structural features of the 'String To EObject' class.   
>- * 
> * @generated
> * @ordered
> */
> int STRING_TO_EOBJECT_FEATURE_COUNT = 2;
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained
>- * Ref Single Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained Ref Single Contained}'.
>+ *  
> * @return the meta object for class 'Ref Single Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained
> * @generated
>@@ -1061,9 +1023,8 @@
> EReference getRefSingleContained_Element();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement
>- * Single Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement Single Contained Element}'.
>+ *  
> * @return the meta object for class 'Single Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement
> * @generated
>@@ -1071,10 +1032,9 @@
> EClass getSingleContainedElement();
> 
> /**
>- * Returns the meta object for the attribute '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getName Name}'.  
>- * 
> * @return the meta object for the attribute 'Name'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getName()
> * @see #getSingleContainedElement()
>@@ -1095,9 +1055,8 @@
> EReference getSingleContainedElement_Parent();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
>- * Ref Single Non Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained Ref Single Non Contained}'.
>+ *  
> * @return the meta object for class 'Ref Single Non Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
> * @generated
>@@ -1117,9 +1076,8 @@
> EReference getRefSingleNonContained_Element();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement
>- * Single Non Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement Single Non Contained Element}'.
>+ *  
> * @return the meta object for class 'Single Non Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement
> * @generated
>@@ -1151,9 +1109,8 @@
> EReference getSingleNonContainedElement_Parent();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
>- * Ref Multi Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained Ref Multi Contained}'.
>+ *  
> * @return the meta object for class 'Ref Multi Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
> * @generated
>@@ -1173,9 +1130,8 @@
> EReference getRefMultiContained_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
>- * Multi Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement Multi Contained Element}'.
>+ *  
> * @return the meta object for class 'Multi Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
> * @generated
>@@ -1183,10 +1139,9 @@
> EClass getMultiContainedElement();
> 
> /**
>- * Returns the meta object for the attribute '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getName Name}'.  
>- * 
> * @return the meta object for the attribute 'Name'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getName()
> * @see #getMultiContainedElement()
>@@ -1207,9 +1162,8 @@
> EReference getMultiContainedElement_Parent();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
>- * Ref Multi Non Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained Ref Multi Non Contained}'.
>+ *  
> * @return the meta object for class 'Ref Multi Non Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
> * @generated
>@@ -1229,9 +1183,8 @@
> EReference getRefMultiNonContained_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement
>- * Multi Non Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement Multi Non Contained Element}'.
>+ *  
> * @return the meta object for class 'Multi Non Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement
> * @generated
>@@ -1263,9 +1216,8 @@
> EReference getMultiNonContainedElement_Parent();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
>- * Ref Single Contained NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL Ref Single Contained NPL}'.
>+ *  
> * @return the meta object for class 'Ref Single Contained NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
> * @generated
>@@ -1285,9 +1237,8 @@
> EReference getRefSingleContainedNPL_Element();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL
>- * Ref Single Non Contained NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL Ref Single Non Contained NPL}'.
>+ *  
> * @return the meta object for class 'Ref Single Non Contained NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL
> * @generated
>@@ -1307,9 +1258,8 @@
> EReference getRefSingleNonContainedNPL_Element();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
>- * Ref Multi Contained NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL Ref Multi Contained NPL}'.
>+ *  
> * @return the meta object for class 'Ref Multi Contained NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
> * @generated
>@@ -1329,9 +1279,8 @@
> EReference getRefMultiContainedNPL_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL
>- * Ref Multi Non Contained NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL Ref Multi Non Contained NPL}'.
>+ *  
> * @return the meta object for class 'Ref Multi Non Contained NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL
> * @generated
>@@ -1351,9 +1300,8 @@
> EReference getRefMultiNonContainedNPL_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite
>- * Contained Element No Opposite}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite Contained Element No Opposite}'.
>+ *  
> * @return the meta object for class 'Contained Element No Opposite'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite
> * @generated
>@@ -1373,9 +1321,8 @@
> EAttribute getContainedElementNoOpposite_Name();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
>- * Gen Ref Single Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained Gen Ref Single Contained}'.
>+ *  
> * @return the meta object for class 'Gen Ref Single Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
> * @generated
>@@ -1395,9 +1342,8 @@
> EReference getGenRefSingleContained_Element();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained
>- * Gen Ref Single Non Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained Gen Ref Single Non Contained}'.
>+ *  
> * @return the meta object for class 'Gen Ref Single Non Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained
> * @generated
>@@ -1417,9 +1363,8 @@
> EReference getGenRefSingleNonContained_Element();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
>- * Gen Ref Multi Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained Gen Ref Multi Contained}'.
>+ *  
> * @return the meta object for class 'Gen Ref Multi Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
> * @generated
>@@ -1439,9 +1384,8 @@
> EReference getGenRefMultiContained_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained
>- * Gen Ref Multi Non Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained Gen Ref Multi Non Contained}'.
>+ *  
> * @return the meta object for class 'Gen Ref Multi Non Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained
> * @generated
>@@ -1461,9 +1405,8 @@
> EReference getGenRefMultiNonContained_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer
>- * Impl Single Ref Container}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer Impl Single Ref Container}'.
>+ *  
> * @return the meta object for class 'Impl Single Ref Container'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer
> * @generated
>@@ -1471,9 +1414,8 @@
> EClass getImplSingleRefContainer();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
>- * Impl Single Ref Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement Impl Single Ref Contained Element}'.
>+ *  
> * @return the meta object for class 'Impl Single Ref Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
> * @generated
>@@ -1493,9 +1435,8 @@
> EAttribute getImplSingleRefContainedElement_Name();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer
>- * Impl Single Ref Non Container}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer Impl Single Ref Non Container}'.
>+ *  
> * @return the meta object for class 'Impl Single Ref Non Container'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer
> * @generated
>@@ -1503,9 +1444,8 @@
> EClass getImplSingleRefNonContainer();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
>- * Impl Single Ref Non Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement Impl Single Ref Non Contained Element}'.
>+ *  
> * @return the meta object for class 'Impl Single Ref Non Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
> * @generated
>@@ -1525,9 +1465,8 @@
> EAttribute getImplSingleRefNonContainedElement_Name();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer
>- * Impl Multi Ref Non Container}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer Impl Multi Ref Non Container}'.
>+ *  
> * @return the meta object for class 'Impl Multi Ref Non Container'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer
> * @generated
>@@ -1535,9 +1474,8 @@
> EClass getImplMultiRefNonContainer();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
>- * Impl Multi Ref Non Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement Impl Multi Ref Non Contained Element}'.
>+ *  
> * @return the meta object for class 'Impl Multi Ref Non Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
> * @generated
>@@ -1557,9 +1495,8 @@
> EAttribute getImplMultiRefNonContainedElement_Name();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
>- * Impl Multi Ref Container}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer Impl Multi Ref Container}'.
>+ *  
> * @return the meta object for class 'Impl Multi Ref Container'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
> * @generated
>@@ -1567,9 +1504,8 @@
> EClass getImplMultiRefContainer();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
>- * Impl Multi Ref Contained Element}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement Impl Multi Ref Contained Element}'.
>+ *  
> * @return the meta object for class 'Impl Multi Ref Contained Element'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
> * @generated
>@@ -1589,9 +1525,8 @@
> EAttribute getImplMultiRefContainedElement_Name();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL
>- * Impl Single Ref Container NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL Impl Single Ref Container NPL}'.
>+ *  
> * @return the meta object for class 'Impl Single Ref Container NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL
> * @generated
>@@ -1599,9 +1534,8 @@
> EClass getImplSingleRefContainerNPL();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
>- * Impl Single Ref Non Container NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL Impl Single Ref Non Container NPL}'.
>+ *  
> * @return the meta object for class 'Impl Single Ref Non Container NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
> * @generated
>@@ -1609,9 +1543,8 @@
> EClass getImplSingleRefNonContainerNPL();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL
>- * Impl Multi Ref Container NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL Impl Multi Ref Container NPL}'.
>+ *  
> * @return the meta object for class 'Impl Multi Ref Container NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL
> * @generated
>@@ -1619,9 +1552,8 @@
> EClass getImplMultiRefContainerNPL();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
>- * Impl Multi Ref Non Container NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL Impl Multi Ref Non Container NPL}'.
>+ *  
> * @return the meta object for class 'Impl Multi Ref Non Container NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
> * @generated
>@@ -1629,9 +1561,8 @@
> EClass getImplMultiRefNonContainerNPL();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL
>- * Impl Contained Element NPL}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL Impl Contained Element NPL}'.
>+ *  
> * @return the meta object for class 'Impl Contained Element NPL'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL
> * @generated
>@@ -1639,9 +1570,8 @@
> EClass getImplContainedElementNPL();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained
>- * Gen Ref Multi NU Non Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained Gen Ref Multi NU Non Contained}'.
>+ *  
> * @return the meta object for class 'Gen Ref Multi NU Non Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained
> * @generated
>@@ -1661,9 +1591,8 @@
> EReference getGenRefMultiNUNonContained_Elements();
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
>- * Gen Ref Map Non Contained}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained Gen Ref Map Non Contained}'.
>+ *  
> * @return the meta object for class 'Gen Ref Map Non Contained'.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
> * @generated
>@@ -1683,21 +1612,21 @@
> EReference getGenRefMapNonContained_Elements();
> 
> /**
>- * Returns the meta object for class '{@link java.util.Map.Entry String To EObject}'. 
>+ * Returns the meta object for class '{@link java.util.Map.Entry String To EObject}'.
>+ * 
> * 
>- * 
> * @return the meta object for class 'String To EObject'.
> * @see java.util.Map.Entry
>- * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.ecore.EObject"
>- * valueResolveProxies="false"
>+ * @model keyDataType="org.eclipse.emf.ecore.EString"
>+ * valueType="org.eclipse.emf.ecore.EObject" valueResolveProxies="false"
> * @generated
> */
> EClass getStringToEObject();
> 
> /**
>- * Returns the meta object for the attribute '{@link java.util.Map.Entry Key}'.   
>- * 
> * @return the meta object for the attribute 'Key'.
> * @see java.util.Map.Entry
> * @see #getStringToEObject()
>@@ -1706,9 +1635,9 @@
> EAttribute getStringToEObject_Key();
> 
> /**
>- * Returns the meta object for the reference '{@link java.util.Map.Entry Value}'. 
>+ * Returns the meta object for the reference '{@link java.util.Map.Entry Value}'.
>+ * 
> * 
>- * 
> * @return the meta object for the reference 'Value'.
> * @see java.util.Map.Entry
> * @see #getStringToEObject()
>@@ -1717,8 +1646,8 @@
> EReference getStringToEObject_Value();
> 
> /**
>- * Returns the factory that creates the instances of the model.  
>- * 
>+ * Returns the factory that creates the instances of the model.
>+ *  
> * @return the factory that creates the instances of the model.
> * @generated
> */
>@@ -1733,15 +1662,13 @@
> * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @generated
> */
> interface Literals
> {
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
>- * Ref Single Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl Ref Single Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContained()
> * @generated
>@@ -1749,17 +1676,16 @@
> EClass REF_SINGLE_CONTAINED = eINSTANCE.getRefSingleContained();
> 
> /**
>- * The meta object literal for the 'Element' containment reference feature. 
>+ * The meta object literal for the 'Element' containment reference feature.
>+ * 
> * 
>- * 
> * @generated
> */
> EReference REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getRefSingleContained_Element();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
>- * Single Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl Single Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleContainedElement()
> * @generated
>@@ -1767,25 +1693,24 @@
> EClass SINGLE_CONTAINED_ELEMENT = eINSTANCE.getSingleContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute SINGLE_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleContainedElement_Name();
> 
> /**
>- * The meta object literal for the 'Parent' container reference feature. 
>+ * The meta object literal for the 'Parent' container reference feature.
>+ * 
> * 
>- * 
> * @generated
> */
> EReference SINGLE_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleContainedElement_Parent();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
>- * Ref Single Non Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl Ref Single Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContained()
> * @generated
>@@ -1793,18 +1718,16 @@
> EClass REF_SINGLE_NON_CONTAINED = eINSTANCE.getRefSingleNonContained();
> 
> /**
>- * The meta object literal for the 'Element' reference feature.   
>- * 
> * @generated
> */
> EReference REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getRefSingleNonContained_Element();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
>- * Single Non Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl Single Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleNonContainedElement()
> * @generated
>@@ -1812,25 +1735,24 @@
> EClass SINGLE_NON_CONTAINED_ELEMENT = eINSTANCE.getSingleNonContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute SINGLE_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleNonContainedElement_Name();
> 
> /**
>- * The meta object literal for the 'Parent' reference feature.   
>- * 
> * @generated
> */
> EReference SINGLE_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleNonContainedElement_Parent();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
>- * Ref Multi Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl Ref Multi Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContained()
> * @generated
>@@ -1846,9 +1768,8 @@
> EReference REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiContained_Elements();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
>- * Multi Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl Multi Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiContainedElement()
> * @generated
>@@ -1856,25 +1777,24 @@
> EClass MULTI_CONTAINED_ELEMENT = eINSTANCE.getMultiContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute MULTI_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiContainedElement_Name();
> 
> /**
>- * The meta object literal for the 'Parent' container reference feature. 
>+ * The meta object literal for the 'Parent' container reference feature.
>+ * 
> * 
>- * 
> * @generated
> */
> EReference MULTI_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiContainedElement_Parent();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
>- * Ref Multi Non Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl Ref Multi Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContained()
> * @generated
>@@ -1882,18 +1802,16 @@
> EClass REF_MULTI_NON_CONTAINED = eINSTANCE.getRefMultiNonContained();
> 
> /**
>- * The meta object literal for the 'Elements' reference list feature.   
>- * 
> * @generated
> */
> EReference REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiNonContained_Elements();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
>- * Multi Non Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl Multi Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedElement()
> * @generated
>@@ -1901,25 +1819,24 @@
> EClass MULTI_NON_CONTAINED_ELEMENT = eINSTANCE.getMultiNonContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name();
> 
> /**
>- * The meta object literal for the 'Parent' reference feature.   
>- * 
> * @generated
> */
> EReference MULTI_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiNonContainedElement_Parent();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
>- * Ref Single Contained NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl Ref Single Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContainedNPL()
> * @generated
>@@ -1927,18 +1844,16 @@
> EClass REF_SINGLE_CONTAINED_NPL = eINSTANCE.getRefSingleContainedNPL();
> 
> /**
>- * The meta object literal for the 'Element' containment reference feature. 
>+ * The meta object literal for the 'Element' containment reference feature.
>+ * 
> * 
>- * 
> * @generated
> */
> EReference REF_SINGLE_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleContainedNPL_Element();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
>- * Ref Single Non Contained NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl Ref Single Non Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL()
> * @generated
>@@ -1946,17 +1861,16 @@
> EClass REF_SINGLE_NON_CONTAINED_NPL = eINSTANCE.getRefSingleNonContainedNPL();
> 
> /**
>- * The meta object literal for the 'Element' reference feature.   
>- * 
> * @generated
> */
> EReference REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleNonContainedNPL_Element();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
>- * Ref Multi Contained NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl Ref Multi Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContainedNPL()
> * @generated
>@@ -1972,9 +1886,8 @@
> EReference REF_MULTI_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiContainedNPL_Elements();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
>- * Ref Multi Non Contained NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl Ref Multi Non Contained NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL()
> * @generated
>@@ -1982,18 +1895,16 @@
> EClass REF_MULTI_NON_CONTAINED_NPL = eINSTANCE.getRefMultiNonContainedNPL();
> 
> /**
>- * The meta object literal for the 'Elements' reference list feature.   
>- * 
> * @generated
> */
> EReference REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiNonContainedNPL_Elements();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
>- * Contained Element No Opposite}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl Contained Element No Opposite}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getContainedElementNoOpposite()
> * @generated
>@@ -2001,17 +1912,16 @@
> EClass CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getContainedElementNoOpposite();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute CONTAINED_ELEMENT_NO_OPPOSITE__NAME = eINSTANCE.getContainedElementNoOpposite_Name();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
>- * Gen Ref Single Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl Gen Ref Single Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleContained()
> * @generated
>@@ -2019,18 +1929,16 @@
> EClass GEN_REF_SINGLE_CONTAINED = eINSTANCE.getGenRefSingleContained();
> 
> /**
>- * The meta object literal for the 'Element' containment reference feature. 
>+ * The meta object literal for the 'Element' containment reference feature.
>+ * 
> * 
>- * 
> * @generated
> */
> EReference GEN_REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleContained_Element();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
>- * Gen Ref Single Non Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl Gen Ref Single Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleNonContained()
> * @generated
>@@ -2038,17 +1946,16 @@
> EClass GEN_REF_SINGLE_NON_CONTAINED = eINSTANCE.getGenRefSingleNonContained();
> 
> /**
>- * The meta object literal for the 'Element' reference feature.   
>- * 
> * @generated
> */
> EReference GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleNonContained_Element();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
>- * Gen Ref Multi Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl Gen Ref Multi Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiContained()
> * @generated
>@@ -2064,9 +1971,8 @@
> EReference GEN_REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiContained_Elements();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
>- * Gen Ref Multi Non Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl Gen Ref Multi Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNonContained()
> * @generated
>@@ -2074,17 +1980,16 @@
> EClass GEN_REF_MULTI_NON_CONTAINED = eINSTANCE.getGenRefMultiNonContained();
> 
> /**
>- * The meta object literal for the 'Elements' reference list feature.   
>- * 
> * @generated
> */
> EReference GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNonContained_Elements();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
>- * Impl Single Ref Container}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl Impl Single Ref Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainer()
> * @generated
>@@ -2092,10 +1997,8 @@
> EClass IMPL_SINGLE_REF_CONTAINER = eINSTANCE.getImplSingleRefContainer();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
>- * Impl Single Ref Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl Impl Single Ref Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainedElement()
> * @generated
>@@ -2103,18 +2006,16 @@
> EClass IMPL_SINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefContainedElement_Name();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
>- * Impl Single Ref Non Container}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl Impl Single Ref Non Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainer()
> * @generated
>@@ -2122,10 +2023,8 @@
> EClass IMPL_SINGLE_REF_NON_CONTAINER = eINSTANCE.getImplSingleRefNonContainer();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
>- * Impl Single Ref Non Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl Impl Single Ref Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement()
> * @generated
>@@ -2133,18 +2032,16 @@
> EClass IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefNonContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefNonContainedElement_Name();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
>- * Impl Multi Ref Non Container}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl Impl Multi Ref Non Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainer()
> * @generated
>@@ -2152,10 +2049,8 @@
> EClass IMPL_MULTI_REF_NON_CONTAINER = eINSTANCE.getImplMultiRefNonContainer();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
>- * Impl Multi Ref Non Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl Impl Multi Ref Non Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement()
> * @generated
>@@ -2163,17 +2058,16 @@
> EClass IMPL_MULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefNonContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefNonContainedElement_Name();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
>- * Impl Multi Ref Container}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl Impl Multi Ref Container}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainer()
> * @generated
>@@ -2181,10 +2075,8 @@
> EClass IMPL_MULTI_REF_CONTAINER = eINSTANCE.getImplMultiRefContainer();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
>- * Impl Multi Ref Contained Element}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl Impl Multi Ref Contained Element}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainedElement()
> * @generated
>@@ -2192,18 +2084,16 @@
> EClass IMPL_MULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefContainedElement();
> 
> /**
>- * The meta object literal for the 'Name' attribute feature.   
>- * 
> * @generated
> */
> EAttribute IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefContainedElement_Name();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
>- * Impl Single Ref Container NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl Impl Single Ref Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL()
> * @generated
>@@ -2211,10 +2101,8 @@
> EClass IMPL_SINGLE_REF_CONTAINER_NPL = eINSTANCE.getImplSingleRefContainerNPL();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
>- * Impl Single Ref Non Container NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl Impl Single Ref Non Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL()
> * @generated
>@@ -2222,10 +2110,8 @@
> EClass IMPL_SINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getImplSingleRefNonContainerNPL();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
>- * Impl Multi Ref Container NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl Impl Multi Ref Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL()
> * @generated
>@@ -2233,10 +2119,8 @@
> EClass IMPL_MULTI_REF_CONTAINER_NPL = eINSTANCE.getImplMultiRefContainerNPL();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
>- * Impl Multi Ref Non Container NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl Impl Multi Ref Non Container NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL()
> * @generated
>@@ -2244,9 +2128,8 @@
> EClass IMPL_MULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getImplMultiRefNonContainerNPL();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
>- * Impl Contained Element NPL}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl Impl Contained Element NPL}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplContainedElementNPL()
> * @generated
>@@ -2254,10 +2137,8 @@
> EClass IMPL_CONTAINED_ELEMENT_NPL = eINSTANCE.getImplContainedElementNPL();
> 
> /**
>- * The meta object literal for the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
>- * Gen Ref Multi NU Non Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl Gen Ref Multi NU Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained()
> * @generated
>@@ -2265,17 +2146,16 @@
> EClass GEN_REF_MULTI_NU_NON_CONTAINED = eINSTANCE.getGenRefMultiNUNonContained();
> 
> /**
>- * The meta object literal for the 'Elements' reference list feature.   
>- * 
> * @generated
> */
> EReference GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNUNonContained_Elements();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
>- * Gen Ref Map Non Contained}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl Gen Ref Map Non Contained}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMapNonContained()
> * @generated
>@@ -2291,9 +2171,8 @@
> EReference GEN_REF_MAP_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMapNonContained_Elements();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
>- * String To EObject}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl String To EObject}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getStringToEObject()
> * @generated
>@@ -2301,17 +2180,17 @@
> EClass STRING_TO_EOBJECT = eINSTANCE.getStringToEObject();
> 
> /**
>- * The meta object literal for the 'Key' attribute feature.   
>- * 
> * @generated
> */
> EAttribute STRING_TO_EOBJECT__KEY = eINSTANCE.getStringToEObject_Key();
> 
> /**
>- * The meta object literal for the 'Value' reference feature.   
>- * 
> * @generated
> */
> EReference STRING_TO_EOBJECT__VALUE = eINSTANCE.getStringToEObject_Value();
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,53 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefMultiNonContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Multi Non Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiNonContained()
>- * @model
>- * @generated
>- */
>-public interface RefMultiNonContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement}. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getParent Parent}'. 
>- * 
>- * If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiNonContained_Elements()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getParent
>- * @model opposite="parent"
>- * @generated
>- */
>- EList<MultiNonContainedElement> getElements();
>-
>-} // RefMultiNonContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4Factory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/model4Factory.java	3 Jan 2010 09:57:40 -0000
>@@ -12,43 +12,73 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4;
> 
>-import org.eclipse.emf.ecore.EFactory;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
> 
> /**
> *  The Factory for the model. It provides a create method for each non-abstract class of
> * the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package
> * @generated
> */
>-public interface model4Factory extends EFactory
>+public interface model4Factory extends org.eclipse.emf.cdo.tests.model4.model4Factory
> {
> /**
>- * The singleton instance of the factory.  
>- * 
>+ * The singleton instance of the factory.
>+ *  
> * @generated
> */
> model4Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model4.impl.model4FactoryImpl.init();
> 
> /**
>- * Returns a new object of class 'Ref Single Contained'.  
>- * 
>+ * Returns a new object of class 'Ref Single Contained'.
>+ *  
> * @return a new object of class 'Ref Single Contained'.
> * @generated
> */
> RefSingleContained createRefSingleContained();
> 
> /**
>- * Returns a new object of class 'Single Contained Element'.  
>- * 
>+ * Returns a new object of class 'Single Contained Element'.
>+ *  
> * @return a new object of class 'Single Contained Element'.
> * @generated
> */
> SingleContainedElement createSingleContainedElement();
> 
> /**
>- * Returns a new object of class 'Ref Single Non Contained'.  
>- * 
>+ * Returns a new object of class 'Ref Single Non Contained'.
>+ *  
> * @return a new object of class 'Ref Single Non Contained'.
> * @generated
> */
>@@ -64,40 +94,40 @@
> SingleNonContainedElement createSingleNonContainedElement();
> 
> /**
>- * Returns a new object of class 'Ref Multi Contained'.  
>- * 
>+ * Returns a new object of class 'Ref Multi Contained'.
>+ *  
> * @return a new object of class 'Ref Multi Contained'.
> * @generated
> */
> RefMultiContained createRefMultiContained();
> 
> /**
>- * Returns a new object of class 'Multi Contained Element'.  
>- * 
>+ * Returns a new object of class 'Multi Contained Element'.
>+ *  
> * @return a new object of class 'Multi Contained Element'.
> * @generated
> */
> MultiContainedElement createMultiContainedElement();
> 
> /**
>- * Returns a new object of class 'Ref Multi Non Contained'.  
>- * 
>+ * Returns a new object of class 'Ref Multi Non Contained'.
>+ *  
> * @return a new object of class 'Ref Multi Non Contained'.
> * @generated
> */
> RefMultiNonContained createRefMultiNonContained();
> 
> /**
>- * Returns a new object of class 'Multi Non Contained Element'.  
>- * 
>+ * Returns a new object of class 'Multi Non Contained Element'.
>+ *  
> * @return a new object of class 'Multi Non Contained Element'.
> * @generated
> */
> MultiNonContainedElement createMultiNonContainedElement();
> 
> /**
>- * Returns a new object of class 'Ref Single Contained NPL'.  
>- * 
>+ * Returns a new object of class 'Ref Single Contained NPL'.
>+ *  
> * @return a new object of class 'Ref Single Contained NPL'.
> * @generated
> */
>@@ -113,16 +143,16 @@
> RefSingleNonContainedNPL createRefSingleNonContainedNPL();
> 
> /**
>- * Returns a new object of class 'Ref Multi Contained NPL'.  
>- * 
>+ * Returns a new object of class 'Ref Multi Contained NPL'.
>+ *  
> * @return a new object of class 'Ref Multi Contained NPL'.
> * @generated
> */
> RefMultiContainedNPL createRefMultiContainedNPL();
> 
> /**
>- * Returns a new object of class 'Ref Multi Non Contained NPL'.  
>- * 
>+ * Returns a new object of class 'Ref Multi Non Contained NPL'.
>+ *  
> * @return a new object of class 'Ref Multi Non Contained NPL'.
> * @generated
> */
>@@ -138,8 +168,8 @@
> ContainedElementNoOpposite createContainedElementNoOpposite();
> 
> /**
>- * Returns a new object of class 'Gen Ref Single Contained'.  
>- * 
>+ * Returns a new object of class 'Gen Ref Single Contained'.
>+ *  
> * @return a new object of class 'Gen Ref Single Contained'.
> * @generated
> */
>@@ -155,33 +185,33 @@
> GenRefSingleNonContained createGenRefSingleNonContained();
> 
> /**
>- * Returns a new object of class 'Gen Ref Multi Contained'.  
>- * 
>+ * Returns a new object of class 'Gen Ref Multi Contained'.
>+ *  
> * @return a new object of class 'Gen Ref Multi Contained'.
> * @generated
> */
> GenRefMultiContained createGenRefMultiContained();
> 
> /**
>- * Returns a new object of class 'Gen Ref Multi Non Contained'.  
>- * 
>+ * Returns a new object of class 'Gen Ref Multi Non Contained'.
>+ *  
> * @return a new object of class 'Gen Ref Multi Non Contained'.
> * @generated
> */
> GenRefMultiNonContained createGenRefMultiNonContained();
> 
> /**
>- * Returns a new object of class 'Impl Single Ref Container'.  
>- * 
>+ * Returns a new object of class 'Impl Single Ref Container'.
>+ *  
> * @return a new object of class 'Impl Single Ref Container'.
> * @generated
> */
> ImplSingleRefContainer createImplSingleRefContainer();
> 
> /**
>- * Returns a new object of class 'Impl Single Ref Contained Element'.   
>- * 
> * @return a new object of class 'Impl Single Ref Contained Element'.
> * @generated
> */
>@@ -197,9 +227,9 @@
> ImplSingleRefNonContainer createImplSingleRefNonContainer();
> 
> /**
>- * Returns a new object of class 'Impl Single Ref Non Contained Element'.   
>- * 
> * @return a new object of class 'Impl Single Ref Non Contained Element'.
> * @generated
> */
>@@ -215,26 +245,26 @@
> ImplMultiRefNonContainer createImplMultiRefNonContainer();
> 
> /**
>- * Returns a new object of class 'Impl Multi Ref Non Contained Element'.   
>- * 
> * @return a new object of class 'Impl Multi Ref Non Contained Element'.
> * @generated
> */
> ImplMultiRefNonContainedElement createImplMultiRefNonContainedElement();
> 
> /**
>- * Returns a new object of class 'Impl Multi Ref Container'.  
>- * 
>+ * Returns a new object of class 'Impl Multi Ref Container'.
>+ *  
> * @return a new object of class 'Impl Multi Ref Container'.
> * @generated
> */
> ImplMultiRefContainer createImplMultiRefContainer();
> 
> /**
>- * Returns a new object of class 'Impl Multi Ref Contained Element'.   
>- * 
> * @return a new object of class 'Impl Multi Ref Contained Element'.
> * @generated
> */
>@@ -250,9 +280,9 @@
> ImplSingleRefContainerNPL createImplSingleRefContainerNPL();
> 
> /**
>- * Returns a new object of class 'Impl Single Ref Non Container NPL'.   
>- * 
> * @return a new object of class 'Impl Single Ref Non Container NPL'.
> * @generated
> */
>@@ -268,17 +298,17 @@
> ImplMultiRefContainerNPL createImplMultiRefContainerNPL();
> 
> /**
>- * Returns a new object of class 'Impl Multi Ref Non Container NPL'.   
>- * 
> * @return a new object of class 'Impl Multi Ref Non Container NPL'.
> * @generated
> */
> ImplMultiRefNonContainerNPL createImplMultiRefNonContainerNPL();
> 
> /**
>- * Returns a new object of class 'Impl Contained Element NPL'.  
>- * 
>+ * Returns a new object of class 'Impl Contained Element NPL'.
>+ *  
> * @return a new object of class 'Impl Contained Element NPL'.
> * @generated
> */
>@@ -294,16 +324,16 @@
> GenRefMultiNUNonContained createGenRefMultiNUNonContained();
> 
> /**
>- * Returns a new object of class 'Gen Ref Map Non Contained'.  
>- * 
>+ * Returns a new object of class 'Gen Ref Map Non Contained'.
>+ *  
> * @return a new object of class 'Gen Ref Map Non Contained'.
> * @generated
> */
> GenRefMapNonContained createGenRefMapNonContained();
> 
> /**
>- * Returns the package supported by this factory.  
>- * 
>+ * Returns the package supported by this factory.
>+ *  
> * @return the package supported by this factory.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ContainedElementNoOpposite.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ContainedElementNoOpposite.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ContainedElementNoOpposite.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ContainedElementNoOpposite.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,59 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ContainedElementNoOpposite.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Contained Element No Opposite'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite#getName Name}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getContainedElementNoOpposite()
>- * @model
>- * @generated
>- */
>-public interface ContainedElementNoOpposite extends EObject
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getContainedElementNoOpposite_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>-} // ContainedElementNoOpposite
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNUNonContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNUNonContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNUNonContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNUNonContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: GenRefMultiNUNonContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Gen Ref Multi NU Non Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMultiNUNonContained()
>- * @model
>- * @generated
>- */
>-public interface GenRefMultiNUNonContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' reference list. The list contents are of type
>- * {@link org.eclipse.emf.ecore.EObject}. 
>- * 
>- * If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMultiNUNonContained_Elements()
>- * @model resolveProxies="false"
>- * @generated
>- */
>- EList<EObject> getElements();
>-
>-} // GenRefMultiNUNonContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/SingleContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/SingleContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/SingleContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/SingleContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,90 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: SingleContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Single Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getSingleContainedElement()
>- * @model
>- * @generated
>- */
>-public interface SingleContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getSingleContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getName Name}
>- * ' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>- /**
>- * Returns the value of the 'Parent' container reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained#getElement Element}'. 
>- * 
>- * If the meaning of the 'Parent' container reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' container reference.
>- * @see #setParent(RefSingleContained)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getSingleContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained#getElement
>- * @model opposite="element" transient="false"
>- * @generated
>- */
>- RefSingleContained getParent();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getParent
>- * Parent}' container reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' container reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(RefSingleContained value);
>-
>-} // SingleContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContainedNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContainedNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContainedNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContainedNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefMultiContainedNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Multi Contained NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiContainedNPL()
>- * @model
>- * @generated
>- */
>-public interface RefMultiContainedNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' containment reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite}. 
>- * 
>- * If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' containment reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiContainedNPL_Elements()
>- * @model containment="true"
>- * @generated
>- */
>- EList<ContainedElementNoOpposite> getElements();
>-
>-} // RefMultiContainedNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainer.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplSingleRefContainer.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer;
>-
>-/**
>- *  A representation of the model object 'Impl Single Ref Container'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefContainer()
>- * @model
>- * @generated
>- */
>-public interface ImplSingleRefContainer extends ISingleRefContainer
>-{
>-} // ImplSingleRefContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,59 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplSingleRefNonContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement;
>-
>-/**
>- *  A representation of the model object 'Impl Single Ref Non Contained Element'.
>- * 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement#getName Name}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefNonContainedElement()
>- * @model
>- * @generated
>- */
>-public interface ImplSingleRefNonContainedElement extends ISingleRefNonContainedElement
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefNonContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>-} // ImplSingleRefNonContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/SingleNonContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/SingleNonContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/SingleNonContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/SingleNonContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,89 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: SingleNonContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Single Non Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getSingleNonContainedElement()
>- * @model
>- * @generated
>- */
>-public interface SingleNonContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getSingleNonContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>- /**
>- * Returns the value of the 'Parent' reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained#getElement Element}'. 
>- * 
>- * If the meaning of the 'Parent' reference isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' reference.
>- * @see #setParent(RefSingleNonContained)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getSingleNonContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained#getElement
>- * @model opposite="element"
>- * @generated
>- */
>- RefSingleNonContained getParent();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getParent
>- * Parent}' reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(RefSingleNonContained value);
>-
>-} // SingleNonContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainerNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplMultiRefContainerNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL;
>-
>-/**
>- *  A representation of the model object 'Impl Multi Ref Container NPL'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefContainerNPL()
>- * @model
>- * @generated
>- */
>-public interface ImplMultiRefContainerNPL extends IMultiRefContainerNPL
>-{
>-} // ImplMultiRefContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainerNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplMultiRefNonContainerNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL;
>-
>-/**
>- *  A representation of the model object 'Impl Multi Ref Non Container NPL'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefNonContainerNPL()
>- * @model
>- * @generated
>- */
>-public interface ImplMultiRefNonContainerNPL extends IMultiRefNonContainerNPL
>-{
>-} // ImplMultiRefNonContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContainedNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContainedNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContainedNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiNonContainedNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefMultiNonContainedNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Multi Non Contained NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiNonContainedNPL()
>- * @model
>- * @generated
>- */
>-public interface RefMultiNonContainedNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite}. 
>- * 
>- * If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiNonContainedNPL_Elements()
>- * @model
>- * @generated
>- */
>- EList<ContainedElementNoOpposite> getElements();
>-
>-} // RefMultiNonContainedNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleNonContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleNonContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleNonContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleNonContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: GenRefSingleNonContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Gen Ref Single Non Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefSingleNonContained()
>- * @model
>- * @generated
>- */
>-public interface GenRefSingleNonContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' reference. 
>- * 
>- * If the meaning of the 'Element' reference isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' reference.
>- * @see #setElement(EObject)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefSingleNonContained_Element()
>- * @model
>- * @generated
>- */
>- EObject getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained#getElement
>- * Element}' reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(EObject value);
>-
>-} // GenRefSingleNonContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,59 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplMultiRefNonContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement;
>-
>-/**
>- *  A representation of the model object 'Impl Multi Ref Non Contained Element'.
>- * 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement#getName Name}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefNonContainedElement()
>- * @model
>- * @generated
>- */
>-public interface ImplMultiRefNonContainedElement extends IMultiRefNonContainedElement
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefNonContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>-} // ImplMultiRefNonContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainerNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplSingleRefNonContainerNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL;
>-
>-/**
>- *  A representation of the model object 'Impl Single Ref Non Container NPL'.
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefNonContainerNPL()
>- * @model
>- * @generated
>- */
>-public interface ImplSingleRefNonContainerNPL extends ISingleRefNonContainerNPL
>-{
>-} // ImplSingleRefNonContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplContainedElementNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplContainedElementNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplContainedElementNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplContainedElementNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,28 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplContainedElementNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement;
>-
>-/**
>- *  A representation of the model object 'Impl Contained Element NPL'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplContainedElementNPL()
>- * @model
>- * @generated
>- */
>-public interface ImplContainedElementNPL extends IContainedElementNoParentLink, INamedElement
>-{
>-} // ImplContainedElementNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: GenRefMultiContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Gen Ref Multi Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMultiContained()
>- * @model
>- * @generated
>- */
>-public interface GenRefMultiContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' containment reference list. The list contents are of type
>- * {@link org.eclipse.emf.ecore.EObject}. 
>- * 
>- * If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' containment reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMultiContained_Elements()
>- * @model containment="true"
>- * @generated
>- */
>- EList<EObject> getElements();
>-
>-} // GenRefMultiContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefNonContainer.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplSingleRefNonContainer.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer;
>-
>-/**
>- *  A representation of the model object 'Impl Single Ref Non Container'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefNonContainer()
>- * @model
>- * @generated
>- */
>-public interface ImplSingleRefNonContainer extends ISingleRefNonContainer
>-{
>-} // ImplSingleRefNonContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMapNonContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMapNonContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMapNonContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMapNonContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: GenRefMapNonContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EMap;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Gen Ref Map Non Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMapNonContained()
>- * @model
>- * @generated
>- */
>-public interface GenRefMapNonContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' map. The key is of type {@link java.lang.String}, and the value
>- * is of type {@link org.eclipse.emf.ecore.EObject}, 
>- * 
>- * If the meaning of the 'Elements' map isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' map.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMapNonContained_Elements()
>- * @model mapType=
>- * "org.eclipse.emf.cdo.tests.legacy.model4.StringToEObject<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EObject>"
>- * @generated
>- */
>- EMap<String, EObject> getElements();
>-
>-} // GenRefMapNonContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefNonContainer.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplMultiRefNonContainer.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer;
>-
>-/**
>- *  A representation of the model object 'Impl Multi Ref Non Container'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefNonContainer()
>- * @model
>- * @generated
>- */
>-public interface ImplMultiRefNonContainer extends IMultiRefNonContainer
>-{
>-} // ImplMultiRefNonContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainerNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplSingleRefContainerNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL;
>-
>-/**
>- *  A representation of the model object 'Impl Single Ref Container NPL'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefContainerNPL()
>- * @model
>- * @generated
>- */
>-public interface ImplSingleRefContainerNPL extends ISingleRefContainerNPL
>-{
>-} // ImplSingleRefContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,59 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplMultiRefContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement;
>-
>-/**
>- *  A representation of the model object 'Impl Multi Ref Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement#getName Name}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefContainedElement()
>- * @model
>- * @generated
>- */
>-public interface ImplMultiRefContainedElement extends IMultiRefContainedElement
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>-} // ImplMultiRefContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,63 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefSingleContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Single Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleContained()
>- * @model
>- * @generated
>- */
>-public interface RefSingleContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' containment reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getParent Parent}'. 
>- * 
>- * If the meaning of the 'Element' containment reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' containment reference.
>- * @see #setElement(SingleContainedElement)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleContained_Element()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement#getParent
>- * @model opposite="parent" containment="true"
>- * @generated
>- */
>- SingleContainedElement getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained#getElement
>- * Element}' containment reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' containment reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(SingleContainedElement value);
>-
>-} // RefSingleContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/MultiContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/MultiContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/MultiContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/MultiContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,90 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: MultiContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Multi Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getMultiContainedElement()
>- * @model
>- * @generated
>- */
>-public interface MultiContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getMultiContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getName Name}'
>- * attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>- /**
>- * Returns the value of the 'Parent' container reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained#getElements Elements}'. 
>- * 
>- * If the meaning of the 'Parent' container reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' container reference.
>- * @see #setParent(RefMultiContained)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getMultiContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained#getElements
>- * @model opposite="elements" transient="false"
>- * @generated
>- */
>- RefMultiContained getParent();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getParent
>- * Parent}' container reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' container reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(RefMultiContained value);
>-
>-} // MultiContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,63 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefSingleNonContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Single Non Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleNonContained()
>- * @model
>- * @generated
>- */
>-public interface RefSingleNonContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getParent Parent}'. 
>- * 
>- * If the meaning of the 'Element' reference isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' reference.
>- * @see #setElement(SingleNonContainedElement)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleNonContained_Element()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement#getParent
>- * @model opposite="parent"
>- * @generated
>- */
>- SingleNonContainedElement getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained#getElement
>- * Element}' reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(SingleNonContainedElement value);
>-
>-} // RefSingleNonContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefSingleContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: GenRefSingleContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Gen Ref Single Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefSingleContained()
>- * @model
>- * @generated
>- */
>-public interface GenRefSingleContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' containment reference. 
>- * 
>- * If the meaning of the 'Element' containment reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' containment reference.
>- * @see #setElement(EObject)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefSingleContained_Element()
>- * @model containment="true"
>- * @generated
>- */
>- EObject getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained#getElement
>- * Element}' containment reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' containment reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(EObject value);
>-
>-} // GenRefSingleContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplSingleRefContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,59 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplSingleRefContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement;
>-
>-/**
>- *  A representation of the model object 'Impl Single Ref Contained Element'.
>- * 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement#getName Name}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefContainedElement()
>- * @model
>- * @generated
>- */
>-public interface ImplSingleRefContainedElement extends ISingleRefContainedElement
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplSingleRefContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>-} // ImplSingleRefContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefMultiContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,53 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefMultiContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Multi Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiContained()
>- * @model
>- * @generated
>- */
>-public interface RefMultiContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' containment reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement}. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getParent Parent}'. 
>- * 
>- * If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' containment reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefMultiContained_Elements()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement#getParent
>- * @model opposite="parent" containment="true"
>- * @generated
>- */
>- EList<MultiContainedElement> getElements();
>-
>-} // RefMultiContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/MultiNonContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/MultiNonContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/MultiNonContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/MultiNonContainedElement.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,89 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: MultiNonContainedElement.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Multi Non Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getMultiNonContainedElement()
>- * @model
>- * @generated
>- */
>-public interface MultiNonContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getMultiNonContainedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>- /**
>- * Returns the value of the 'Parent' reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained#getElements Elements}'. 
>- * 
>- * If the meaning of the 'Parent' reference isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' reference.
>- * @see #setParent(RefMultiNonContained)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getMultiNonContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained#getElements
>- * @model opposite="elements"
>- * @generated
>- */
>- RefMultiNonContained getParent();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement#getParent
>- * Parent}' reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(RefMultiNonContained value);
>-
>-} // MultiNonContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContainedNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContainedNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContainedNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleNonContainedNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefSingleNonContainedNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Single Non Contained NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleNonContainedNPL()
>- * @model
>- * @generated
>- */
>-public interface RefSingleNonContainedNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' reference. 
>- * 
>- * If the meaning of the 'Element' reference isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' reference.
>- * @see #setElement(ContainedElementNoOpposite)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleNonContainedNPL_Element()
>- * @model
>- * @generated
>- */
>- ContainedElementNoOpposite getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL#getElement
>- * Element}' reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(ContainedElementNoOpposite value);
>-
>-} // RefSingleNonContainedNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/ImplMultiRefContainer.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ImplMultiRefContainer.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer;
>-
>-/**
>- *  A representation of the model object 'Impl Multi Ref Container'. 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getImplMultiRefContainer()
>- * @model
>- * @generated
>- */
>-public interface ImplMultiRefContainer extends IMultiRefContainer
>-{
>-} // ImplMultiRefContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNonContained.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNonContained.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNonContained.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/GenRefMultiNonContained.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: GenRefMultiNonContained.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Gen Ref Multi Non Contained'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMultiNonContained()
>- * @model
>- * @generated
>- */
>-public interface GenRefMultiNonContained extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' reference list. The list contents are of type
>- * {@link org.eclipse.emf.ecore.EObject}. 
>- * 
>- * If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getGenRefMultiNonContained_Elements()
>- * @model
>- * @generated
>- */
>- EList<EObject> getElements();
>-
>-} // GenRefMultiNonContained
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContainedNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContainedNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContainedNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/RefSingleContainedNPL.java	22 Aug 2009 09:34:58 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: RefSingleContainedNPL.java,v 1.2 2009/08/22 09:34:58 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Ref Single Contained NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleContainedNPL()
>- * @model
>- * @generated
>- */
>-public interface RefSingleContainedNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' containment reference. 
>- * 
>- * If the meaning of the 'Element' containment reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' containment reference.
>- * @see #setElement(ContainedElementNoOpposite)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#getRefSingleContainedNPL_Element()
>- * @model containment="true"
>- * @generated
>- */
>- ContainedElementNoOpposite getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL#getElement
>- * Element}' containment reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' containment reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(ContainedElementNoOpposite value);
>-
>-} // RefSingleContainedNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 MultiNonContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,11 +29,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl#getParent Parent}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNonContainedElement
>@@ -49,8 +49,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -69,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected MultiNonContainedElementImpl()
>@@ -79,7 +78,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -90,7 +88,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -100,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -114,7 +110,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiNonContained getParent()
>@@ -135,7 +130,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiNonContained basicGetParent()
>@@ -145,7 +139,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(RefMultiNonContained newParent, NotificationChain msgs)
>@@ -166,7 +159,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(RefMultiNonContained newParent)
>@@ -191,7 +183,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -210,7 +201,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -226,7 +216,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -246,7 +235,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -266,7 +254,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -286,7 +273,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -304,7 +290,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplMultiRefContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -31,11 +31,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl#getParent Parent}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl#getName Name}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplMultiRefContainedElementImpl extends EObjectImpl implements ImplMultiRefContainedElement
>@@ -51,8 +51,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -61,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplMultiRefContainedElementImpl()
>@@ -71,7 +70,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -82,7 +80,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public IMultiRefContainer getParent()
>@@ -94,7 +91,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(IMultiRefContainer newParent, NotificationChain msgs)
>@@ -105,7 +101,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(IMultiRefContainer newParent)
>@@ -132,7 +127,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -142,7 +136,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -174,7 +166,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -190,7 +181,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -207,7 +197,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -225,7 +214,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -245,7 +233,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -265,7 +252,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -283,7 +269,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplMultiRefNonContainerNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
> 
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EClass;
>@@ -29,19 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl#getElements Elements
>- * }</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements ImplMultiRefNonContainerNPL
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' reference list.   
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -50,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplMultiRefNonContainerNPLImpl()
>@@ -60,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -71,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<IContainedElementNoParentLink> getElements()
>@@ -86,7 +82,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -102,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -121,7 +115,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -138,7 +131,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplMultiRefNonContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -30,12 +30,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl#getParent Parent
>- * }</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl#getName Name}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements ImplMultiRefNonContainedElement
>@@ -61,8 +60,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -71,7 +70,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplMultiRefNonContainedElementImpl()
>@@ -81,7 +79,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -92,7 +89,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public IMultiRefNonContainer getParent()
>@@ -113,7 +109,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public IMultiRefNonContainer basicGetParent()
>@@ -123,7 +118,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(IMultiRefNonContainer newParent, NotificationChain msgs)
>@@ -144,7 +138,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(IMultiRefNonContainer newParent)
>@@ -169,7 +162,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -179,7 +171,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -193,7 +184,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -212,7 +202,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -228,7 +217,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -248,7 +236,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -268,7 +255,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -288,7 +274,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -306,7 +291,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 GenRefMultiNonContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
> 
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EClass;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMultiNonContained
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' reference list.   
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected GenRefMultiNonContainedImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<EObject> getElements()
>@@ -85,7 +82,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -120,7 +115,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -137,7 +131,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 StringToEObjectImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java	22 Aug 2009 09:34:57 -0000	1.2
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -58,9 +58,9 @@
> protected String key = KEY_EDEFAULT;
> 
> /**
>- * The cached value of the '{@link #getTypedValue() Value}' reference.   
>- * 
> * @see #getTypedValue()
> * @generated
> * @ordered
>@@ -69,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected StringToEObjectImpl()
>@@ -79,7 +78,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -90,7 +88,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getTypedKey()
>@@ -100,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setTypedKey(String newKey)
>@@ -113,7 +109,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EObject getTypedValue()
>@@ -123,7 +118,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setTypedValue(EObject newValue)
>@@ -136,7 +130,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -154,7 +147,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -174,7 +166,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -194,7 +185,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -212,7 +202,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -230,14 +219,12 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected int hash = -1;
> 
> /**
> *  
>- * 
> * @generated
> */
> public int getHash()
>@@ -252,7 +239,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setHash(int hash)
>@@ -262,7 +248,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getKey()
>@@ -272,7 +257,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setKey(String key)
>@@ -282,7 +266,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EObject getValue()
>@@ -292,7 +275,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EObject setValue(EObject value)
>@@ -304,7 +286,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 MultiContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -30,11 +30,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl#getParent Parent}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class MultiContainedElementImpl extends EObjectImpl implements MultiContainedElement
>@@ -50,8 +50,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -60,7 +60,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected MultiContainedElementImpl()
>@@ -70,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -81,7 +79,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -91,7 +88,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -104,7 +100,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiContained getParent()
>@@ -116,7 +111,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(RefMultiContained newParent, NotificationChain msgs)
>@@ -127,7 +121,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(RefMultiContained newParent)
>@@ -154,7 +147,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -172,7 +164,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -188,7 +179,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -205,7 +195,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -223,7 +212,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -243,7 +231,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -263,7 +250,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -281,7 +267,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplSingleRefNonContainerImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -30,18 +30,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSingleRefNonContainer
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' reference.   
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -50,7 +50,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplSingleRefNonContainerImpl()
>@@ -60,7 +59,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -71,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ISingleRefNonContainedElement getElement()
>@@ -92,7 +89,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ISingleRefNonContainedElement basicGetElement()
>@@ -102,7 +98,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(ISingleRefNonContainedElement newElement, NotificationChain msgs)
>@@ -123,7 +118,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(ISingleRefNonContainedElement newElement)
>@@ -150,7 +144,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -170,7 +163,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -186,7 +178,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -204,7 +195,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -221,7 +211,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -238,7 +227,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplContainedElementNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
>@@ -28,10 +28,10 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl#getName Name}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplContainedElementNPL
>@@ -47,8 +47,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -57,7 +57,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplContainedElementNPLImpl()
>@@ -67,7 +66,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -78,7 +76,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -102,7 +98,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -118,7 +113,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -135,7 +129,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -152,7 +145,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -168,7 +160,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -189,7 +180,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -210,7 +200,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplSingleRefNonContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -30,12 +30,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl#getParent Parent
>- * }</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl#getName Name}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements ImplSingleRefNonContainedElement
>@@ -61,8 +60,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -71,7 +70,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplSingleRefNonContainedElementImpl()
>@@ -81,7 +79,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -92,7 +89,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ISingleRefNonContainer getParent()
>@@ -113,7 +109,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ISingleRefNonContainer basicGetParent()
>@@ -123,7 +118,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(ISingleRefNonContainer newParent, NotificationChain msgs)
>@@ -144,7 +138,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(ISingleRefNonContainer newParent)
>@@ -169,7 +162,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -179,7 +171,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -193,7 +184,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -212,7 +202,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -228,7 +217,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -248,7 +236,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -268,7 +255,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -288,7 +274,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -306,7 +291,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4FactoryImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4FactoryImpl.java	3 Jan 2010 09:57:43 -0000
>@@ -12,40 +12,40 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Factory;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>@@ -57,22 +57,21 @@
> 
> /**
> *  An implementation of the model Factory. 
>- * 
> * @generated
> */
> public class model4FactoryImpl extends EFactoryImpl implements model4Factory
> {
> /**
>- * Creates the default factory implementation.  
>- * 
>- * @generated
>+ * Creates the default factory implementation.
>+ *  
>+ * @generated NOT
> */
> public static model4Factory init()
> {
> try
> {
> model4Factory themodel4Factory = (model4Factory)EPackage.Registry.INSTANCE
>- .getEFactory("http://www.eclipse.org/emf/CDO/tests/model4/1.0.0");
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model4/1.0.0");
> if (themodel4Factory != null)
> {
> return themodel4Factory;
>@@ -86,8 +85,8 @@
> }
> 
> /**
>- * Creates an instance of the factory.  
>- * 
>+ * Creates an instance of the factory.
>+ *  
> * @generated
> */
> public model4FactoryImpl()
>@@ -97,7 +96,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -178,7 +176,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleContained createRefSingleContained()
>@@ -189,7 +186,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SingleContainedElement createSingleContainedElement()
>@@ -200,7 +196,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleNonContained createRefSingleNonContained()
>@@ -211,7 +206,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SingleNonContainedElement createSingleNonContainedElement()
>@@ -222,7 +216,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiContained createRefMultiContained()
>@@ -233,7 +226,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public MultiContainedElement createMultiContainedElement()
>@@ -244,7 +236,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiNonContained createRefMultiNonContained()
>@@ -255,7 +246,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public MultiNonContainedElement createMultiNonContainedElement()
>@@ -266,7 +256,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleContainedNPL createRefSingleContainedNPL()
>@@ -277,7 +266,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleNonContainedNPL createRefSingleNonContainedNPL()
>@@ -288,7 +276,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiContainedNPL createRefMultiContainedNPL()
>@@ -299,7 +286,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefMultiNonContainedNPL createRefMultiNonContainedNPL()
>@@ -310,7 +296,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ContainedElementNoOpposite createContainedElementNoOpposite()
>@@ -321,7 +306,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public GenRefSingleContained createGenRefSingleContained()
>@@ -332,7 +316,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public GenRefSingleNonContained createGenRefSingleNonContained()
>@@ -343,7 +326,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public GenRefMultiContained createGenRefMultiContained()
>@@ -354,7 +336,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public GenRefMultiNonContained createGenRefMultiNonContained()
>@@ -365,7 +346,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplSingleRefContainer createImplSingleRefContainer()
>@@ -376,7 +356,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplSingleRefContainedElement createImplSingleRefContainedElement()
>@@ -387,7 +366,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplSingleRefNonContainer createImplSingleRefNonContainer()
>@@ -398,7 +376,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplSingleRefNonContainedElement createImplSingleRefNonContainedElement()
>@@ -409,7 +386,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplMultiRefNonContainer createImplMultiRefNonContainer()
>@@ -420,7 +396,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplMultiRefNonContainedElement createImplMultiRefNonContainedElement()
>@@ -431,7 +406,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplMultiRefContainer createImplMultiRefContainer()
>@@ -442,7 +416,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplMultiRefContainedElement createImplMultiRefContainedElement()
>@@ -453,7 +426,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplSingleRefContainerNPL createImplSingleRefContainerNPL()
>@@ -464,7 +436,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplSingleRefNonContainerNPL createImplSingleRefNonContainerNPL()
>@@ -475,7 +446,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplMultiRefContainerNPL createImplMultiRefContainerNPL()
>@@ -486,7 +456,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplMultiRefNonContainerNPL createImplMultiRefNonContainerNPL()
>@@ -497,7 +466,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ImplContainedElementNPL createImplContainedElementNPL()
>@@ -508,7 +476,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public GenRefMultiNUNonContained createGenRefMultiNUNonContained()
>@@ -519,7 +486,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public GenRefMapNonContained createGenRefMapNonContained()
>@@ -530,7 +496,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public Map.Entry<String, EObject> createStringToEObject()
>@@ -541,7 +506,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public model4Package getmodel4Package()
>@@ -551,7 +515,6 @@
> 
> /**
> *  
>- * 
> * @deprecated
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefMultiNonContainedNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
> 
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EClass;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMultiNonContainedNPL
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' reference list.   
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefMultiNonContainedNPLImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<ContainedElementNoOpposite> getElements()
>@@ -85,7 +82,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -120,7 +115,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -137,7 +131,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefMultiContainedNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiContainedNPL
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' containment reference list.  
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefMultiContainedNPLImpl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<ContainedElementNoOpposite> getElements()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -104,7 +100,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -120,7 +115,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -139,7 +133,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplSingleRefContainerNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSingleRefContainerNPL
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' containment reference. 
>+ * The cached value of the '{@link #getElement() Element}' containment reference.
>+ * 
> * 
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplSingleRefContainerNPLImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public IContainedElementNoParentLink getElement()
>@@ -80,7 +77,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(IContainedElementNoParentLink newElement, NotificationChain msgs)
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(IContainedElementNoParentLink newElement)
>@@ -126,7 +121,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -142,7 +136,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -158,7 +151,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -175,7 +167,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -192,7 +183,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplSingleRefContainerImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -30,18 +30,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingleRefContainer
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' containment reference. 
>+ * The cached value of the '{@link #getElement() Element}' containment reference.
>+ * 
> * 
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -50,7 +50,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplSingleRefContainerImpl()
>@@ -60,7 +59,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -71,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ISingleRefContainedElement getElement()
>@@ -81,7 +78,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(ISingleRefContainedElement newElement, NotificationChain msgs)
>@@ -102,7 +98,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(ISingleRefContainedElement newElement)
>@@ -127,7 +122,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -146,7 +140,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -162,7 +155,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -178,7 +170,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -195,7 +186,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -212,7 +202,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 GenRefMultiNUNonContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.2
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
> 
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EClass;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRefMultiNUNonContained
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' reference list.   
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected GenRefMultiNUNonContainedImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<EObject> getElements()
>@@ -84,7 +81,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -100,7 +96,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -119,7 +114,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -136,7 +130,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefSingleNonContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleNonContained
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' reference.   
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefSingleNonContainedImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SingleNonContainedElement getElement()
>@@ -91,7 +88,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SingleNonContainedElement basicGetElement()
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(SingleNonContainedElement newElement, NotificationChain msgs)
>@@ -122,7 +117,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(SingleNonContainedElement newElement)
>@@ -147,7 +141,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -166,7 +159,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -182,7 +174,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -200,7 +191,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -217,7 +207,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -234,7 +223,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 SingleNonContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,11 +29,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl#getParent Parent}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class SingleNonContainedElementImpl extends EObjectImpl implements SingleNonContainedElement
>@@ -49,8 +49,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -69,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected SingleNonContainedElementImpl()
>@@ -79,7 +78,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -90,7 +88,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -100,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -114,7 +110,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleNonContained getParent()
>@@ -135,7 +130,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleNonContained basicGetParent()
>@@ -145,7 +139,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(RefSingleNonContained newParent, NotificationChain msgs)
>@@ -166,7 +159,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(RefSingleNonContained newParent)
>@@ -191,7 +183,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -210,7 +201,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -226,7 +216,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -246,7 +235,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -266,7 +254,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -286,7 +273,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -304,7 +290,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefSingleContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefSingleContainedImpl extends EObjectImpl implements RefSingleContained
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' containment reference. 
>+ * The cached value of the '{@link #getElement() Element}' containment reference.
>+ * 
> * 
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefSingleContainedImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SingleContainedElement getElement()
>@@ -80,7 +77,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(SingleContainedElement newElement, NotificationChain msgs)
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(SingleContainedElement newElement)
>@@ -126,7 +121,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -145,7 +139,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -161,7 +154,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -177,7 +169,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -194,7 +185,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -211,7 +201,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefSingleNonContainedNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
>@@ -28,18 +28,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSingleNonContainedNPL
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' reference.   
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -48,7 +48,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefSingleNonContainedNPLImpl()
>@@ -58,7 +57,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -69,7 +67,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ContainedElementNoOpposite getElement()
>@@ -90,7 +87,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ContainedElementNoOpposite basicGetElement()
>@@ -100,7 +96,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(ContainedElementNoOpposite newElement)
>@@ -114,7 +109,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -132,7 +126,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -149,7 +142,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -166,7 +158,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplSingleRefContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -31,11 +31,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl#getParent Parent}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl#getName Name}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplSingleRefContainedElementImpl extends EObjectImpl implements ImplSingleRefContainedElement
>@@ -51,8 +51,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -61,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplSingleRefContainedElementImpl()
>@@ -71,7 +70,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -82,7 +80,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ISingleRefContainer getParent()
>@@ -94,7 +91,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(ISingleRefContainer newParent, NotificationChain msgs)
>@@ -105,7 +101,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(ISingleRefContainer newParent)
>@@ -132,7 +127,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -142,7 +136,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -174,7 +166,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -190,7 +181,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -207,7 +197,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -225,7 +214,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -245,7 +233,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -265,7 +252,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -283,7 +269,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 GenRefMapNonContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.2
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EMap;
>@@ -31,10 +31,10 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapNonContained
>@@ -51,7 +51,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected GenRefMapNonContainedImpl()
>@@ -61,7 +60,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -72,7 +70,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EMap<String, EObject> getElements()
>@@ -87,7 +84,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -103,7 +99,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -122,7 +117,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -139,7 +133,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 GenRefSingleNonContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
>@@ -28,18 +28,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefSingleNonContained
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' reference.   
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -48,7 +48,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected GenRefSingleNonContainedImpl()
>@@ -58,7 +57,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -69,7 +67,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EObject getElement()
>@@ -90,7 +87,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EObject basicGetElement()
>@@ -100,7 +96,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(EObject newElement)
>@@ -114,7 +109,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -132,7 +126,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -149,7 +142,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -166,7 +158,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 GenRefSingleContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSingleContained
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' containment reference. 
>+ * The cached value of the '{@link #getElement() Element}' containment reference.
>+ * 
> * 
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected GenRefSingleContainedImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EObject getElement()
>@@ -80,7 +77,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(EObject newElement, NotificationChain msgs)
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(EObject newElement)
>@@ -126,7 +121,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -142,7 +136,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -158,7 +151,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -175,7 +167,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -192,7 +183,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefMultiNonContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNonContained
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' reference list.   
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefMultiNonContainedImpl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<MultiNonContainedElement> getElements()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -105,7 +101,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -121,7 +116,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -137,7 +131,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -173,7 +165,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplMultiRefNonContainerImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -33,18 +33,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMultiRefNonContainer
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' reference list.   
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -53,7 +53,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplMultiRefNonContainerImpl()
>@@ -63,7 +62,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -74,7 +72,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<IMultiRefNonContainedElement> getElements()
>@@ -90,7 +87,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -107,7 +103,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -123,7 +118,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -139,7 +133,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -158,7 +151,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -175,7 +167,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 SingleContainedElementImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -30,11 +30,11 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl#getName Name}</li>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl#getParent Parent}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class SingleContainedElementImpl extends EObjectImpl implements SingleContainedElement
>@@ -50,8 +50,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -60,7 +60,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected SingleContainedElementImpl()
>@@ -70,7 +69,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -81,7 +79,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -91,7 +88,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -104,7 +100,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public RefSingleContained getParent()
>@@ -116,7 +111,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetParent(RefSingleContained newParent, NotificationChain msgs)
>@@ -127,7 +121,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setParent(RefSingleContained newParent)
>@@ -154,7 +147,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -172,7 +164,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -188,7 +179,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -205,7 +195,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -223,7 +212,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -243,7 +231,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -263,7 +250,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -281,7 +267,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplMultiRefContainerNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMultiRefContainerNPL
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' containment reference list.  
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplMultiRefContainerNPLImpl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<IContainedElementNoParentLink> getElements()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -104,7 +100,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -120,7 +115,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -139,7 +133,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 GenRefMultiContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMultiContained
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' containment reference list.  
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected GenRefMultiContainedImpl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<EObject> getElements()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -104,7 +100,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -120,7 +115,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -139,7 +133,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4PackageImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java	3 Jan 2010 09:57:43 -0000
>@@ -12,41 +12,41 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Factory;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
> 
> import org.eclipse.emf.ecore.EAttribute;
> import org.eclipse.emf.ecore.EClass;
>@@ -58,238 +58,204 @@
> 
> /**
> *  An implementation of the model Package. 
>- * 
> * @generated
> */
> public class model4PackageImpl extends EPackageImpl implements model4Package
> {
> /**
> *  
>- * 
> * @generated
> */
> private EClass refSingleContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass singleContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refSingleNonContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass singleNonContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refMultiContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass multiContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refMultiNonContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass multiNonContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refSingleContainedNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refSingleNonContainedNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refMultiContainedNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass refMultiNonContainedNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass containedElementNoOppositeEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass genRefSingleContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass genRefSingleNonContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass genRefMultiContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass genRefMultiNonContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implSingleRefContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implSingleRefContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implSingleRefNonContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implSingleRefNonContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implMultiRefNonContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implMultiRefNonContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implMultiRefContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implMultiRefContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implSingleRefContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implSingleRefNonContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implMultiRefContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implMultiRefNonContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass implContainedElementNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass genRefMultiNUNonContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass genRefMapNonContainedEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass stringToEObjectEClass = null;
>@@ -314,18 +280,17 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> private static boolean isInited = false;
> 
> /**
> * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>- * 
>- * This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed. Clients should not
>- * invoke it directly. Instead, they should simply access that field to obtain the package. 
>- * 
> * 
>+ * This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
> * @see #eNS_URI
> * @see #createPackageContents()
> * @see #initializePackageContents()
>@@ -362,7 +327,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefSingleContained()
>@@ -372,7 +336,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefSingleContained_Element()
>@@ -382,7 +345,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getSingleContainedElement()
>@@ -392,7 +354,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getSingleContainedElement_Name()
>@@ -402,7 +363,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getSingleContainedElement_Parent()
>@@ -412,7 +372,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefSingleNonContained()
>@@ -422,7 +381,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefSingleNonContained_Element()
>@@ -432,7 +390,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getSingleNonContainedElement()
>@@ -442,7 +399,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getSingleNonContainedElement_Name()
>@@ -452,7 +408,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getSingleNonContainedElement_Parent()
>@@ -462,7 +417,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefMultiContained()
>@@ -472,7 +426,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefMultiContained_Elements()
>@@ -482,7 +435,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getMultiContainedElement()
>@@ -492,7 +444,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getMultiContainedElement_Name()
>@@ -502,7 +453,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getMultiContainedElement_Parent()
>@@ -512,7 +462,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefMultiNonContained()
>@@ -522,7 +471,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefMultiNonContained_Elements()
>@@ -532,7 +480,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getMultiNonContainedElement()
>@@ -542,7 +489,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getMultiNonContainedElement_Name()
>@@ -552,7 +498,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getMultiNonContainedElement_Parent()
>@@ -562,7 +507,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefSingleContainedNPL()
>@@ -572,7 +516,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefSingleContainedNPL_Element()
>@@ -582,7 +525,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefSingleNonContainedNPL()
>@@ -592,7 +534,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefSingleNonContainedNPL_Element()
>@@ -602,7 +543,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefMultiContainedNPL()
>@@ -612,7 +552,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefMultiContainedNPL_Elements()
>@@ -622,7 +561,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getRefMultiNonContainedNPL()
>@@ -632,7 +570,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getRefMultiNonContainedNPL_Elements()
>@@ -642,7 +579,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getContainedElementNoOpposite()
>@@ -652,7 +588,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getContainedElementNoOpposite_Name()
>@@ -662,7 +597,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getGenRefSingleContained()
>@@ -672,7 +606,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getGenRefSingleContained_Element()
>@@ -682,7 +615,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getGenRefSingleNonContained()
>@@ -692,7 +624,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getGenRefSingleNonContained_Element()
>@@ -702,7 +633,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getGenRefMultiContained()
>@@ -712,7 +642,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getGenRefMultiContained_Elements()
>@@ -722,7 +651,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getGenRefMultiNonContained()
>@@ -732,7 +660,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getGenRefMultiNonContained_Elements()
>@@ -742,7 +669,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplSingleRefContainer()
>@@ -752,7 +678,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplSingleRefContainedElement()
>@@ -762,7 +687,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getImplSingleRefContainedElement_Name()
>@@ -772,7 +696,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplSingleRefNonContainer()
>@@ -782,7 +705,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplSingleRefNonContainedElement()
>@@ -792,7 +714,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getImplSingleRefNonContainedElement_Name()
>@@ -802,7 +723,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplMultiRefNonContainer()
>@@ -812,7 +732,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplMultiRefNonContainedElement()
>@@ -822,7 +741,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getImplMultiRefNonContainedElement_Name()
>@@ -832,7 +750,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplMultiRefContainer()
>@@ -842,7 +759,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplMultiRefContainedElement()
>@@ -852,7 +768,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getImplMultiRefContainedElement_Name()
>@@ -862,7 +777,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplSingleRefContainerNPL()
>@@ -872,7 +786,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplSingleRefNonContainerNPL()
>@@ -882,7 +795,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplMultiRefContainerNPL()
>@@ -892,7 +804,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplMultiRefNonContainerNPL()
>@@ -902,7 +813,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getImplContainedElementNPL()
>@@ -912,7 +822,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getGenRefMultiNUNonContained()
>@@ -922,7 +831,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getGenRefMultiNUNonContained_Elements()
>@@ -932,7 +840,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getGenRefMapNonContained()
>@@ -942,7 +849,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getGenRefMapNonContained_Elements()
>@@ -952,7 +858,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getStringToEObject()
>@@ -962,7 +867,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getStringToEObject_Key()
>@@ -972,7 +876,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getStringToEObject_Value()
>@@ -982,7 +885,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public model4Factory getmodel4Factory()
>@@ -992,15 +894,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void createPackageContents()
>@@ -1108,15 +1009,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void initializePackageContents()
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefSingleContainedNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
>@@ -29,18 +29,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl#getElement Element}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleContainedNPL
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' containment reference. 
>+ * The cached value of the '{@link #getElement() Element}' containment reference.
>+ * 
> * 
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -49,7 +49,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefSingleContainedNPLImpl()
>@@ -59,7 +58,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +68,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public ContainedElementNoOpposite getElement()
>@@ -80,7 +77,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public NotificationChain basicSetElement(ContainedElementNoOpposite newElement, NotificationChain msgs)
>@@ -101,7 +97,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(ContainedElementNoOpposite newElement)
>@@ -126,7 +121,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -142,7 +136,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -158,7 +151,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -175,7 +167,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -192,7 +183,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplSingleRefNonContainerNPLImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
>@@ -28,19 +28,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl#getElement Element}
>- * </li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl#getElement Element}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements ImplSingleRefNonContainerNPL
> {
> /**
>- * The cached value of the '{@link #getElement() Element}' reference.   
>- * 
> * @see #getElement()
> * @generated
> * @ordered
>@@ -49,7 +48,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplSingleRefNonContainerNPLImpl()
>@@ -59,7 +57,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -70,7 +67,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public IContainedElementNoParentLink getElement()
>@@ -91,7 +87,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public IContainedElementNoParentLink basicGetElement()
>@@ -101,7 +96,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setElement(IContainedElementNoParentLink newElement)
>@@ -115,7 +109,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -133,7 +126,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -150,7 +142,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -167,7 +158,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 RefMultiContainedImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java	3 Jan 2010 09:57:42 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContained
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' containment reference list.  
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected RefMultiContainedImpl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<MultiContainedElement> getElements()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -105,7 +101,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -121,7 +116,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -137,7 +131,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -173,7 +165,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ImplMultiRefContainerImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java	22 Aug 2009 09:34:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -33,18 +33,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl#getElements Elements}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl#getElements Elements}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiRefContainer
> {
> /**
>- * The cached value of the '{@link #getElements() Elements}' containment reference list.  
>- * 
> * @see #getElements()
> * @generated
> * @ordered
>@@ -53,7 +53,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ImplMultiRefContainerImpl()
>@@ -63,7 +62,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -74,7 +72,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<IMultiRefContainedElement> getElements()
>@@ -90,7 +87,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -107,7 +103,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -123,7 +118,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -139,7 +133,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -158,7 +151,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -175,7 +167,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ContainedElementNoOppositeImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java	22 Aug 2009 09:34:58 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java	3 Jan 2010 09:57:41 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
>@@ -26,10 +26,10 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl#getName Name}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class ContainedElementNoOppositeImpl extends EObjectImpl implements ContainedElementNoOpposite
>@@ -45,8 +45,8 @@
> protected static final String NAME_EDEFAULT = null;
> 
> /**
>- * The cached value of the '{@link #getName() Name}' attribute.  
>- * 
>+ * The cached value of the '{@link #getName() Name}' attribute.
>+ *  
> * @see #getName()
> * @generated
> * @ordered
>@@ -55,7 +55,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected ContainedElementNoOppositeImpl()
>@@ -65,7 +64,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -76,7 +74,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public String getName()
>@@ -86,7 +83,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setName(String newName)
>@@ -100,7 +96,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -116,7 +111,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -133,7 +127,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -150,7 +143,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -166,7 +158,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4AdapterFactory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java	22 Aug 2009 09:34:59 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java	3 Jan 2010 09:57:43 -0000
>@@ -12,53 +12,53 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.util;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
> 
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notifier;
>@@ -70,22 +70,21 @@
> /**
> *  The Adapter Factory for the model. It provides an adapter <code>createXXX</code>
> * method for each class of the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package
> * @generated
> */
> public class model4AdapterFactory extends AdapterFactoryImpl
> {
> /**
>- * The cached model package.  
>- * 
>+ * The cached model package.
>+ *  
> * @generated
> */
> protected static model4Package modelPackage;
> 
> /**
>- * Creates an instance of the adapter factory.  
>- * 
>+ * Creates an instance of the adapter factory.
>+ *  
> * @generated
> */
> public model4AdapterFactory()
>@@ -97,10 +96,10 @@
> }
> 
> /**
>- * Returns whether this factory is applicable for the type of the object.  This implementation
>+ * Returns whether this factory is applicable for the type of the object.
>+ *  This implementation
> * returns <code>true</code> if the object is either the model's package or is an instance object of the model. 
>- * 
> * @return whether this factory is applicable for the type of the object.
> * @generated
> */
>@@ -119,8 +118,8 @@
> }
> 
> /**
>- * The switch that delegates to the <code>createXXX</code> methods.  
>- * 
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ *  
> * @generated
> */
> protected model4Switch<Adapter> modelSwitch = new model4Switch<Adapter>()
>@@ -415,10 +414,9 @@
> };
> 
> /**
>- * Creates an adapter for the <code>target</code>.  
>- * 
>- * @param target
>- * the object to adapt.
>+ * Creates an adapter for the <code>target</code>.
>+ *  
>+ * @param target the object to adapt.
> * @return the adapter for the <code>target</code>.
> * @generated
> */
>@@ -429,11 +427,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained
>- * Ref Single Contained}'.  This default implementation returns null so that we can
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained Ref Single Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained
> * @generated
>@@ -459,11 +456,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
>- * Ref Single Non Contained}'.  This default implementation returns null so that we
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained Ref Single Non Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
> * @generated
>@@ -474,11 +470,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement Single Non Contained Element}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement Single Non Contained Element}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement
> * @generated
>@@ -489,11 +483,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
>- * Ref Multi Contained}'.  This default implementation returns null so that we can
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained Ref Multi Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
> * @generated
>@@ -504,11 +497,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
>- * Multi Contained Element}'.  This default implementation returns null so that we can
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement Multi Contained Element}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
> * @generated
>@@ -519,11 +511,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
>- * Ref Multi Non Contained}'.  This default implementation returns null so that we can
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained Ref Multi Non Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
> * @generated
>@@ -534,11 +525,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement Multi Non Contained Element}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement Multi Non Contained Element}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement
> * @generated
>@@ -549,11 +538,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
>- * Ref Single Contained NPL}'.  This default implementation returns null so that we
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL Ref Single Contained NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
> * @generated
>@@ -564,11 +552,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL Ref Single Non Contained NPL}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL Ref Single Non Contained NPL}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL
> * @generated
>@@ -579,11 +565,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
>- * Ref Multi Contained NPL}'.  This default implementation returns null so that we can
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL Ref Multi Contained NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
> * @generated
>@@ -609,11 +594,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite Contained Element No Opposite}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite Contained Element No Opposite}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite
> * @generated
>@@ -624,11 +607,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
>- * Gen Ref Single Contained}'.  This default implementation returns null so that we
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained Gen Ref Single Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
> * @generated
>@@ -639,11 +621,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained Gen Ref Single Non Contained}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained Gen Ref Single Non Contained}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained
> * @generated
>@@ -654,11 +634,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
>- * Gen Ref Multi Contained}'.  This default implementation returns null so that we can
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained Gen Ref Multi Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
> * @generated
>@@ -699,12 +678,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
>- * Impl Single Ref Contained Element}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement Impl Single Ref Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
> * @generated
>@@ -715,11 +692,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer Impl Single Ref Non Container}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer Impl Single Ref Non Container}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer
> * @generated
>@@ -730,12 +705,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
>- * Impl Single Ref Non Contained Element}'.  This default implementation returns null
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement Impl Single Ref Non Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
> * @generated
>@@ -746,11 +719,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer Impl Multi Ref Non Container}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer Impl Multi Ref Non Container}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer
> * @generated
>@@ -761,12 +732,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
>- * Impl Multi Ref Non Contained Element}'.  This default implementation returns null
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement Impl Multi Ref Non Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
> * @generated
>@@ -777,11 +746,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
>- * Impl Multi Ref Container}'.  This default implementation returns null so that we
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer Impl Multi Ref Container}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
> * @generated
>@@ -792,12 +760,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
>- * Impl Multi Ref Contained Element}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement Impl Multi Ref Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
> * @generated
>@@ -808,11 +774,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL Impl Single Ref Container NPL}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL Impl Single Ref Container NPL}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL
> * @generated
>@@ -823,12 +787,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
>- * Impl Single Ref Non Container NPL}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL Impl Single Ref Non Container NPL}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
> * @generated
>@@ -839,11 +801,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL Impl Multi Ref Container NPL}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL Impl Multi Ref Container NPL}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL
> * @generated
>@@ -854,12 +814,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
>- * Impl Multi Ref Non Container NPL}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL Impl Multi Ref Non Container NPL}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
> * @generated
>@@ -885,11 +843,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained Gen Ref Multi NU Non Contained}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained Gen Ref Multi NU Non Contained}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained
> * @generated
>@@ -900,11 +856,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
>- * Gen Ref Map Non Contained}'.  This default implementation returns null so that we
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained Gen Ref Map Non Contained}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
> * @generated
>@@ -944,12 +899,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
>- * ISingle Ref Contained Element}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement ISingle Ref Contained Element}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
> * @generated
>@@ -960,11 +913,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer ISingle Ref Non Container}
>- * '.  This default implementation returns null so that we can easily ignore cases; it's useful
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer ISingle Ref Non Container}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer
> * @generated
>@@ -975,12 +926,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
>- * ISingle Ref Non Contained Element}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement ISingle Ref Non Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
> * @generated
>@@ -991,11 +940,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer IMulti Ref Non Container}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer IMulti Ref Non Container}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer
> * @generated
>@@ -1006,12 +953,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
>- * IMulti Ref Non Contained Element}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement IMulti Ref Non Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
> * @generated
>@@ -1037,12 +982,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
>- * IMulti Ref Contained Element}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement IMulti Ref Contained Element}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
> * @generated
>@@ -1053,11 +996,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL ISingle Ref Container NPL}
>- * '.  This default implementation returns null so that we can easily ignore cases; it's useful
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL ISingle Ref Container NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL
> * @generated
>@@ -1068,12 +1009,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
>- * ISingle Ref Non Container NPL}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL ISingle Ref Non Container NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
> * @generated
>@@ -1084,11 +1023,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL IMulti Ref Container NPL}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL IMulti Ref Container NPL}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL
> * @generated
>@@ -1099,12 +1036,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
>- * IMulti Ref Non Container NPL}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL IMulti Ref Non Container NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
> * @generated
>@@ -1115,12 +1050,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
>- * IContained Element No Parent Link}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink IContained Element No Parent Link}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
> * @generated
>@@ -1146,9 +1079,9 @@
> }
> 
> /**
>- * Creates a new adapter for the default case.  This default implementation returns null.  This default implementation returns null. 
>- * 
> * @return the new adapter.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4Switch.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java	22 Aug 2009 09:34:59 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java	3 Jan 2010 09:57:44 -0000
>@@ -12,53 +12,53 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4.util;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained;
>-import org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement;
> import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
>+import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
>+import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
>+import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>@@ -71,22 +71,21 @@
> * {@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. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package
> * @generated
> */
> public class model4Switch<T>
> {
> /**
>- * The cached model package  
>- * 
>+ * The cached model package
>+ *  
> * @generated
> */
> protected static model4Package modelPackage;
> 
> /**
>- * Creates an instance of the switch.  
>- * 
>+ * Creates an instance of the switch.
>+ *  
> * @generated
> */
> public model4Switch()
>@@ -100,7 +99,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -112,7 +110,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -132,7 +129,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -503,11 +499,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'Ref Multi Contained'.  This implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'Ref Multi Contained'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -761,9 +756,7 @@
> * Returns the result of interpreting the object as an instance of 'Impl Single Ref Non Contained Element'.
> *  This implementation returns null; returning a non-null result will terminate the switch.
> * 
>- * 
>- * @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 'Impl Single Ref Non Contained Element'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -793,9 +786,7 @@
> * Returns the result of interpreting the object as an instance of 'Impl Multi Ref Non Contained Element'.
> *  This implementation returns null; returning a non-null result will terminate the switch.
> * 
>- * 
>- * @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 'Impl Multi Ref Non Contained Element'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -950,11 +941,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'String To EObject'.  This implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'String To EObject'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -1173,11 +1163,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'INamed Element'. 
>+ * Returns the result of interpreting the object as an instance of 'INamed Element'.
>+ * 
> * This implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'INamed Element'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -1188,12 +1177,11 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'EObject'.  This
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
> * anyway. 
>- * 
>- * @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 'EObject'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF,v
>retrieving revision 1.6
>diff -u -r1.6 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Jun 2009 07:24:57 -0000	1.6
>+++ META-INF/MANIFEST.MF	3 Jan 2010 09:57:40 -0000
>@@ -7,7 +7,8 @@
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
>-Export-Package: org.eclipse.emf.cdo.tests.model4;version="3.0.0",
>+Export-Package: org.eclipse.emf.cdo.tests.legacy.model4,
>+ org.eclipse.emf.cdo.tests.model4;version="3.0.0",
> org.eclipse.emf.cdo.tests.model4.impl;version="3.0.0",
> org.eclipse.emf.cdo.tests.model4.util;version="3.0.0"
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
>Index: model/model4.legacy-genmodel
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel,v
>retrieving revision 1.1
>diff -u -r1.1 model4.legacy-genmodel
>--- model/model4.legacy-genmodel	22 Aug 2009 09:34:59 -0000	1.1
>+++ model/model4.legacy-genmodel	3 Jan 2010 09:57:40 -0000
>@@ -6,7 +6,7 @@
> modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false"
> codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
> complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit"
>- usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy.genmodel#//model4interfaces">
>+ usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel#//model4interfaces">
> <foreignModel>model4.ecore</foreignModel>
> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
> <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"
>#P org.eclipse.emf.cdo.tests
>Index: src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java,v
>retrieving revision 1.14
>diff -u -r1.14 TransactionHandlerTest.java
>--- src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java	20 Oct 2009 06:51:07 -0000	1.14
>+++ src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java	3 Jan 2010 09:57:51 -0000
>@@ -23,6 +23,7 @@
> import org.eclipse.emf.cdo.transaction.CDODefaultTransactionHandler;
> import org.eclipse.emf.cdo.transaction.CDOTransaction;
> import org.eclipse.emf.cdo.transaction.CDOTransactionHandler;
>+import org.eclipse.emf.cdo.util.CDOUtil;
> 
> import java.util.ArrayList;
> import java.util.List;
>@@ -55,8 +56,8 @@
> order.getOrderDetails().add(orderDetail);
> 
> resource1.getContents().add(order);
>- assertEquals(true, handler.getListOfAddingObject().contains(order));
>- assertEquals(true, handler.getListOfAddingObject().contains(orderDetail));
>+ assertEquals(true, handler.getListOfAddingObject().contains(CDOUtil.getCDOObject(order)));
>+ assertEquals(true, handler.getListOfAddingObject().contains(CDOUtil.getCDOObject(orderDetail)));
> 
> transaction.close();
> session.close();
>@@ -142,12 +143,12 @@
> order.getOrderDetails().add(orderDetail);
> 
> resource1.getContents().add(order);
>- assertEquals(true, handler.getListOfAddingObject().contains(order));
>- assertEquals(true, handler.getListOfAddingObject().contains(orderDetail));
>+ assertEquals(true, handler.getListOfAddingObject().contains(CDOUtil.getCDOObject(order)));
>+ assertEquals(true, handler.getListOfAddingObject().contains(CDOUtil.getCDOObject(orderDetail)));
> 
> msg("Remove Object");
> order.getOrderDetails().remove(orderDetail);
>- assertEquals(true, handler.getListOfDetachingObject().contains(orderDetail));
>+ assertEquals(true, handler.getListOfDetachingObject().contains(CDOUtil.getCDOObject(orderDetail)));
> 
> resource1.delete(null);
> assertEquals(true, handler.getListOfDetachingObject().contains(resource1));
>@@ -205,13 +206,13 @@
> order.getOrderDetails().add(orderDetail);
> 
> resource1.getContents().add(order);
>- assertEquals(true, handler.getListOfAddingObject().contains(order));
>- assertEquals(true, handler.getListOfAddingObject().contains(orderDetail));
>+ assertEquals(true, handler.getListOfAddingObject().contains(CDOUtil.getCDOObject(order)));
>+ assertEquals(true, handler.getListOfAddingObject().contains(CDOUtil.getCDOObject(orderDetail)));
> 
> msg("Modifying Object");
> assertEquals(false, handler.getListOfModifyinObject().contains(orderDetail));
> orderDetail.setPrice(1.0f);
>- assertEquals(true, handler.getListOfModifyinObject().contains(orderDetail));
>+ assertEquals(true, handler.getListOfModifyinObject().contains(CDOUtil.getCDOObject(orderDetail)));
> transaction.close();
> session.close();
> }
>Index: src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java,v
>retrieving revision 1.8
>diff -u -r1.8 AdapterManagerTest.java
>--- src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java	5 May 2009 11:11:29 -0000	1.8
>+++ src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java	3 Jan 2010 09:57:49 -0000
>@@ -62,7 +62,7 @@
> System.gc();
> 
> assertEquals(false, transaction.isObjectRegistered(id));
>- companyA = (Company)transaction.getObject(id);
>+ companyA = (Company)CDOUtil.getEObject(transaction.getObject(id));
> assertEquals(0, testAdapter.getNotifications().size());
> companyA.setCity("Ottawa");
> assertEquals(0, testAdapter.getNotifications().size());
>@@ -97,7 +97,7 @@
> System.gc();
> 
> assertEquals(true, transaction.isObjectRegistered(id));
>- companyA = (Company)transaction.getObject(id);
>+ companyA = (Company)CDOUtil.getEObject(transaction.getObject(id));
> 
> assertEquals(0, testAdapter.getNotifications().size());
> companyA.setCity("Ottawa");
>@@ -136,7 +136,7 @@
> System.gc();
> 
> assertEquals(true, transaction.isObjectRegistered(id));
>- companyA = (Company)transaction.getObject(id);
>+ companyA = (Company)CDOUtil.getEObject(transaction.getObject(id));
> 
> assertEquals(0, testAdapter.getNotifications().size());
> companyA.setCity("Ottawa");
>@@ -176,7 +176,7 @@
> System.gc();
> 
> assertEquals(true, transaction.isObjectRegistered(id));
>- Company companyB = (Company)transaction.getObject(id);
>+ Company companyB = (Company)CDOUtil.getEObject(transaction.getObject(id));
> assertEquals(companyB, weakCompanyA.get());
> companyB.setCity("Ottawa");
> transaction.getResource("/resA").getContents().remove(0);
>Index: src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java,v
>retrieving revision 1.13
>diff -u -r1.13 CrossReferenceTest.java
>--- src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java	13 Aug 2009 04:56:17 -0000	1.13
>+++ src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java	3 Jan 2010 09:57:50 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.emf.cdo.tests.model1.Customer;
> import org.eclipse.emf.cdo.tests.model1.SalesOrder;
> import org.eclipse.emf.cdo.transaction.CDOTransaction;
>+import org.eclipse.emf.cdo.util.CDOUtil;
> import org.eclipse.emf.cdo.view.CDOView;
> 
> import org.eclipse.net4j.util.transaction.TransactionException;
>@@ -348,7 +349,7 @@
> externalResource.getContents().add(customer);
> 
> transaction.commit();
>- CDORevisionData data = ((CDOObject)salesOrder).cdoRevision().data();
>+ CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
> CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
> assertTrue(id.isExternal());
> }
>@@ -413,7 +414,7 @@
> externalResource.getContents().add(customer);
> 
> transaction.commit();
>- CDORevisionData data = ((CDOObject)salesOrder).cdoRevision().data();
>+ CDORevisionData data = (CDOUtil.getCDOObject(salesOrder)).cdoRevision().data();
> CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
> assertTrue(id.isExternal());
> }
>@@ -444,7 +445,7 @@
> company.getCustomers().add(customer);
> 
> transaction.commit();
>- CDORevisionData data = ((CDOObject)salesOrder).cdoRevision().data();
>+ CDORevisionData data = (CDOUtil.getCDOObject(salesOrder)).cdoRevision().data();
> CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
> assertFalse(id.isExternal());
> }
>@@ -475,7 +476,7 @@
> externalResource.getContents().add(customer);
> 
> transaction.commit();
>- CDORevisionData data = ((CDOObject)salesOrder).cdoRevision().data();
>+ CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data();
> CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0);
> assertTrue(id.isExternal());
> 
>Index: src/org/eclipse/emf/cdo/tests/SavePointTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java,v
>retrieving revision 1.12
>diff -u -r1.12 SavePointTest.java
>--- src/org/eclipse/emf/cdo/tests/SavePointTest.java	7 Nov 2009 12:32:29 -0000	1.12
>+++ src/org/eclipse/emf/cdo/tests/SavePointTest.java	3 Jan 2010 09:57:51 -0000
>@@ -11,7 +11,6 @@
> */
> package org.eclipse.emf.cdo.tests;
> 
>-import org.eclipse.emf.cdo.CDOObject;
> import org.eclipse.emf.cdo.eresource.CDOResource;
> import org.eclipse.emf.cdo.session.CDOSession;
> import org.eclipse.emf.cdo.tests.model1.Category;
>@@ -226,15 +225,15 @@
> 
> // Test NEW TO TRANSIENT (2 step back)
> assertEquals(true, FSMUtil.isTransient(CDOUtil.getCDOObject(category3)));
>- assertEquals(false, transaction1.getNewObjects().containsKey(((CDOObject)category3).cdoID()));
>+ assertEquals(false, transaction1.getNewObjects().containsKey(CDOUtil.getCDOObject(category3).cdoID()));
> 
> // Test NEW TO TRANSIENT (1 step back)
> assertEquals(true, FSMUtil.isTransient(CDOUtil.getCDOObject(category4)));
>- assertEquals(false, transaction1.getNewObjects().containsKey(((CDOObject)category4).cdoID()));
>+ assertEquals(false, transaction1.getNewObjects().containsKey(CDOUtil.getCDOObject(category4).cdoID()));
> 
> // Test NEW TO NEW
> assertEquals(false, FSMUtil.isTransient(CDOUtil.getCDOObject(category2)));
>- assertEquals(true, transaction1.getNewObjects().containsKey(((CDOObject)category2).cdoID()));
>+ assertEquals(true, transaction1.getNewObjects().containsKey((CDOUtil.getCDOObject(category2)).cdoID()));
> 
> // Test rollback NEW
> assertEquals("CITY1", company1.getCity());
>Index: src/org/eclipse/emf/cdo/tests/InvalidationTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java,v
>retrieving revision 1.35
>diff -u -r1.35 InvalidationTest.java
>--- src/org/eclipse/emf/cdo/tests/InvalidationTest.java	28 Dec 2009 10:26:16 -0000	1.35
>+++ src/org/eclipse/emf/cdo/tests/InvalidationTest.java	3 Jan 2010 09:57:50 -0000
>@@ -518,8 +518,9 @@
> 
> msg("Opening transactionB");
> CDOTransaction transactionB = sessionB.openTransaction();
>- Category categoryB = (Category)transactionB.getObject(cdoidA, true);
>+ Category categoryB;
> 
>+ categoryB = (Category)CDOUtil.getEObject(transactionB.getObject(cdoidA, true));
> msg("Changing name");
> categoryB.setName("CHANGED NAME");
> 
>@@ -532,7 +533,7 @@
> @Override
> protected boolean successful()
> {
>- Category categoryA = (Category)transactionA.getObject(cdoidA, true);
>+ Category categoryA = (Category)CDOUtil.getEObject(transactionA.getObject(cdoidA, true));
> String name = categoryA.getName();
> return "CHANGED NAME".equals(name);
> }
>Index: src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java,v
>retrieving revision 1.31
>diff -u -r1.31 RevisionDeltaTest.java
>--- src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java	28 Dec 2009 10:26:16 -0000	1.31
>+++ src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java	3 Jan 2010 09:57:51 -0000
>@@ -11,7 +11,6 @@
> */
> package org.eclipse.emf.cdo.tests;
> 
>-import org.eclipse.emf.cdo.CDOObject;
> import org.eclipse.emf.cdo.common.id.CDOID;
> import org.eclipse.emf.cdo.common.revision.CDORevision;
> import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta;
>@@ -33,6 +32,7 @@
> 
> import org.eclipse.emf.common.util.BasicEList;
> import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
> 
>@@ -126,7 +126,8 @@
> transaction.close();
> 
> CDOTransaction transaction2 = session.openTransaction();
>- SalesOrder salesOrder2 = (SalesOrder)transaction2.getObject(CDOUtil.getCDOObject(salesOrder).cdoID(), true);
>+ SalesOrder salesOrder2 = (SalesOrder)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(salesOrder)
>+ .cdoID(), true));
> CDORevision salesRevision = CDOUtil.getCDOObject(salesOrder2).cdoRevision();
> EStructuralFeature customerFeature = getModel1Package().getSalesOrder_Customer();
> 
>@@ -432,7 +433,7 @@
> 
> private InternalCDORevision getCopyCDORevision(Object object)
> {
>- return (InternalCDORevision)((CDOObject)object).cdoRevision().copy();
>+ return (InternalCDORevision)CDOUtil.getCDOObject((EObject)object).cdoRevision().copy();
> }
> 
> private void testStoreDelta(ListManipulator manipulator)
>Index: src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java,v
>retrieving revision 1.1
>diff -u -r1.1 AllTestsLegacy.java
>--- src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java	27 Dec 2009 15:50:44 -0000	1.1
>+++ src/org/eclipse/emf/cdo/tests/AllTestsLegacy.java	3 Jan 2010 09:57:49 -0000
>@@ -6,10 +6,20 @@
> * http://www.eclipse.org/legal/epl-v10.html
> *
> * Contributors:
>- * Eike Stepper - initial API and implementation
>+ * Martin Fluegge - initial API and implementation
> */
> package org.eclipse.emf.cdo.tests;
> 
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_246622_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_248915_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251263_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_254489_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_258933_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259695_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_260756_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_266982_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_273565_Test;
>+import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_279982_Test;
> import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
> 
> import java.util.List;
>@@ -18,7 +28,7 @@
> import junit.framework.TestSuite;
> 
> /**
>- * @author Eike Stepper
>+ * @author Martin Fluegge
> */
> public class AllTestsLegacy extends AllTestsAllConfigs
> {
>@@ -30,12 +40,38 @@
> @Override
> protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
> {
>- /**
>- * TODO Martin: currently there is only one test cases for Legacy models. All the other testcases must get become
>- * aware of CDOLegacyWrapper and the other testcases must be converted.
>- */
>- testClasses.add(MangoTest.class);
>- // testClasses.add(InvalidationTest.class);
>+ // testClasses.add(ChunkingTest.class);
>+ super.initTestClasses(testClasses);
>+
>+ testClasses.remove(UnsetTest.class);
>+ testClasses.remove(PushTransactionTest.class); // ArrayStoreException
>+ testClasses.remove(ContainmentTest.class); // ArrayStoreException/NullpointerException in Transaction
>+ testClasses.remove(RollbackTest.class); // Failures
>+ testClasses.remove(CrossReferenceTest.class); // Failures
>+ testClasses.remove(ChunkingTest.class); // ArrayStoreException / ClassCastExecption
>+ testClasses.remove(ChunkingWithMEMTest.class); // java.lang.ClassCastException
>+ testClasses.remove(MetaTest.class); // wa // NullPointer
>+ testClasses.remove(AutoAttacherTest.class); // transaction failure
>+ testClasses.remove(SavePointTest.class);
>+ testClasses.remove(ChangeSubscriptionTest.class); // timeout
>+ testClasses.remove(ExternalReferenceTest.class); // NullPointerException / ObjectNotFoundException
>+ testClasses.remove(XATransactionTest.class);
>+ testClasses.remove(LockingManagerTest.class); // Locking not support in Legacy Mode
>+ testClasses.remove(MultiValuedOfAttributeTest.class); // java.lang.ArrayStoreException
>+ testClasses.remove(ConflictResolverTest.class); // null value in Attribute
>+
>+ //
>+ // Bugzilla verifications
>+ testClasses.remove(Bugzilla_246622_Test.class);
>+ testClasses.remove(Bugzilla_248915_Test.class); // Failure incomplete resource
>+ testClasses.remove(Bugzilla_251263_Test.class);
>+ testClasses.remove(Bugzilla_254489_Test.class); // timeout
>+ testClasses.remove(Bugzilla_258933_Test.class);
>+ testClasses.remove(Bugzilla_259695_Test.class); // ArrayIndexOutOfBounds
>+ testClasses.remove(Bugzilla_260756_Test.class); // ArrayStoreException
>+ testClasses.remove(Bugzilla_266982_Test.class);
>+ testClasses.remove(Bugzilla_273565_Test.class); // locking not supported
>+ testClasses.remove(Bugzilla_279982_Test.class);
> }
> 
> @Override
>Index: src/org/eclipse/emf/cdo/tests/ComplexTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java,v
>retrieving revision 1.20
>diff -u -r1.20 ComplexTest.java
>--- src/org/eclipse/emf/cdo/tests/ComplexTest.java	18 Jul 2009 23:00:50 -0000	1.20
>+++ src/org/eclipse/emf/cdo/tests/ComplexTest.java	3 Jan 2010 09:57:50 -0000
>@@ -12,6 +12,7 @@
> 
> import org.eclipse.emf.cdo.eresource.CDOResource;
> import org.eclipse.emf.cdo.session.CDOSession;
>+import org.eclipse.emf.cdo.tests.config.impl.ModelConfig;
> import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
> import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
> import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
>@@ -126,6 +127,7 @@
> RefSingleNonContained container = factory.createRefSingleNonContained();
> SingleNonContainedElement element0 = factory.createSingleNonContainedElement();
> element0.setName("PlainSingleNonContainedBidirectional-Element-0");
>+ System.out.println(resource1.getContents().size());
> resource1.getContents().add(container);
> resource1.getContents().add(element0);
> container.setElement(element0);
>@@ -152,6 +154,7 @@
> RefSingleContained container = factory.createRefSingleContained();
> SingleContainedElement element0 = factory.createSingleContainedElement();
> element0.setName("PlainSingleContainedBidirectional-Element-0");
>+ System.out.println(resource1.getContents().size());
> resource1.getContents().add(container);
> container.setElement(element0);
> commit();
>@@ -159,7 +162,7 @@
> purgeCaches();
> assertEquals(1, resource1.getContents().size());
> 
>- container = (RefSingleContained)resource1.getContents().get(0);
>+ container = (RefSingleContained)CDOUtil.getEObject(resource1.getContents().get(0));
> element0 = container.getElement();
> 
> assertEquals(container, element0.getParent());
>@@ -188,7 +191,7 @@
> purgeCaches();
> assertEquals(3, resource1.getContents().size());
> 
>- container = (RefMultiNonContained)resource1.getContents().get(0);
>+ container = (RefMultiNonContained)CDOUtil.getEObject(resource1.getContents().get(0));
> element0 = (MultiNonContainedElement)resource1.getContents().get(1);
> element1 = (MultiNonContainedElement)resource1.getContents().get(2);
> 
>@@ -388,12 +391,22 @@
> resource1.getContents().add(container);
> container.setElement(element0);
> 
>- resource1.getContents().add(element0);
>+ if (!isConfig(ModelConfig.Legacy.INSTANCE))
>+ {
>+ resource1.getContents().add(element0);
>+ }
> 
> commit();
> 
> purgeCaches();
>- assertEquals(2, resource1.getContents().size());
>+ if (!isConfig(ModelConfig.Legacy.INSTANCE))
>+ {
>+ assertEquals(2, resource1.getContents().size());
>+ }
>+ else
>+ {
>+ assertEquals(1, resource1.getContents().size());
>+ }
> 
> container = (GenRefSingleContained)resource1.getContents().get(0);
> element0 = (ImplContainedElementNPL)container.getElement();
>@@ -485,7 +498,7 @@
> purgeCaches();
> assertEquals(2, resource1.getContents().size());
> 
>- container = (ImplSingleRefNonContainer)resource1.getContents().get(0);
>+ container = (ImplSingleRefNonContainer)CDOUtil.getEObject(resource1.getContents().get(0));
> ISingleRefNonContainedElement element0_ = (ISingleRefNonContainedElement)resource1.getContents().get(1);
> 
> assertEquals(element0_, container.getElement());
>@@ -511,7 +524,7 @@
> purgeCaches();
> assertEquals(1, resource1.getContents().size());
> 
>- container = (ImplSingleRefContainer)resource1.getContents().get(0);
>+ container = (ImplSingleRefContainer)CDOUtil.getEObject(resource1.getContents().get(0));
> ISingleRefContainedElement element0_ = container.getElement();
> 
> assertEquals(container, element0_.getParent());
>@@ -723,7 +736,7 @@
> assertEquals(1, resource1.getContents().size());
> assertEquals(1, resource2.getContents().size());
> 
>- container = (RefSingleNonContained)resource1.getContents().get(0);
>+ container = (RefSingleNonContained)CDOUtil.getEObject(resource1.getContents().get(0));
> element0 = (SingleNonContainedElement)resource2.getContents().get(0);
> 
> assertEquals(element0, container.getElement());
>@@ -909,7 +922,7 @@
> assertEquals(1, resource1.getContents().size());
> assertEquals(1, resource2.getContents().size());
> 
>- container = (ImplSingleRefNonContainer)resource1.getContents().get(0);
>+ container = (ImplSingleRefNonContainer)CDOUtil.getEObject(resource1.getContents().get(0));
> ISingleRefNonContainedElement element0_ = (ISingleRefNonContainedElement)resource2.getContents().get(0);
> 
> assertEquals(element0_, container.getElement());
>Index: src/org/eclipse/emf/cdo/tests/DetachTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java,v
>retrieving revision 1.16
>diff -u -r1.16 DetachTest.java
>--- src/org/eclipse/emf/cdo/tests/DetachTest.java	7 Nov 2009 12:32:29 -0000	1.16
>+++ src/org/eclipse/emf/cdo/tests/DetachTest.java	3 Jan 2010 09:57:50 -0000
>@@ -19,8 +19,8 @@
> import org.eclipse.emf.cdo.tests.model1.Order;
> import org.eclipse.emf.cdo.tests.model1.OrderDetail;
> import org.eclipse.emf.cdo.tests.model1.Product1;
>-import org.eclipse.emf.cdo.transaction.CDOUserSavepoint;
> import org.eclipse.emf.cdo.transaction.CDOTransaction;
>+import org.eclipse.emf.cdo.transaction.CDOUserSavepoint;
> import org.eclipse.emf.cdo.util.CDOUtil;
> import org.eclipse.emf.cdo.util.ObjectNotFoundException;
> 
>@@ -79,7 +79,7 @@
> 
> resource.getContents().remove(c1);
> assertTransient(c1);
>- assertSame(c1, transaction.getObject(id));
>+ assertSame(c1, CDOUtil.getEObject(transaction.getObject(id)));
> assertSame(c1, transaction.getResourceSet().getEObject(uriC1, false));
> 
> transaction.commit();
>Index: src/org/eclipse/emf/cdo/tests/ResourceTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java,v
>retrieving revision 1.46
>diff -u -r1.46 ResourceTest.java
>--- src/org/eclipse/emf/cdo/tests/ResourceTest.java	28 Dec 2009 10:26:17 -0000	1.46
>+++ src/org/eclipse/emf/cdo/tests/ResourceTest.java	3 Jan 2010 09:57:51 -0000
>@@ -709,7 +709,7 @@
> CDOResource resource = createResource(transaction, "/resource1");
> CDOID resourceID = resource.cdoID();
> 
>- CDOObject object = (CDOObject)resource.getContents().get(0);
>+ CDOObject object = (CDOObject)CDOUtil.getCDOObject(resource.getContents().get(0));
> CDOID objectID = object.cdoID();
> 
> transaction.commit();
>@@ -767,7 +767,7 @@
> CDOResource resource = createResource(transaction, "/resource1");
> CDOID resourceID = resource.cdoID();
> 
>- CDOObject object = (CDOObject)resource.getContents().get(0);
>+ CDOObject object = (CDOObject)CDOUtil.getCDOObject(resource.getContents().get(0));
> CDOID objectID = object.cdoID();
> 
> transaction.commit();
>@@ -980,7 +980,7 @@
> CDOSession session = openModel1Session();
> CDOTransaction transaction = session.openTransaction();
> CDOResource resource = createResource(transaction, "/folder/resource1");
>- CDOObject object = (CDOObject)resource.getContents().get(0);
>+ CDOObject object = (CDOObject)CDOUtil.getCDOObject(resource.getContents().get(0));
> transaction.commit();
> 
> CDOResourceFolder folder = resource.getFolder();
>@@ -1057,7 +1057,7 @@
> CDOSession session = openModel1Session();
> CDOTransaction transaction = session.openTransaction();
> CDOResource resource = createResource(transaction, "/folder/resource1");
>- CDOObject object = (CDOObject)resource.getContents().get(0);
>+ CDOObject object = (CDOObject)CDOUtil.getCDOObject(resource.getContents().get(0));
> transaction.commit();
> 
> CDOResourceFolder folder = resource.getFolder();
>Index: src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java,v
>retrieving revision 1.15
>diff -u -r1.15 ChangeSubscriptionTest.java
>--- src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java	31 Jul 2009 09:51:08 -0000	1.15
>+++ src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java	3 Jan 2010 09:57:49 -0000
>@@ -90,7 +90,8 @@
> msg("Opening view");
> final CDOTransaction transaction2 = session.openTransaction();
> 
>- final Category category1B = (Category)transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true);
>+ final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
>+ .cdoID(), true));
> 
> msg("Changing name");
> category1B.setName("CHANGED NAME");
>@@ -205,7 +206,8 @@
> 
> final CDOTransaction transaction2 = session2.openTransaction();
> 
>- final Category category1B = (Category)transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true);
>+ final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
>+ .cdoID(), true));
> 
> msg("Changing name");
> category1B.setName("CHANGED NAME");
>@@ -300,7 +302,8 @@
> final CDOTransaction transaction2 = session2.openTransaction();
> transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL);
> 
>- final Category category1B = (Category)transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true);
>+ final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
>+ .cdoID(), true));
> 
> msg("Changing name");
> category1B.setName("CHANGED NAME");
>@@ -371,8 +374,10 @@
> 
> final CDOTransaction transaction2 = session2.openTransaction();
> 
>- final Category category1B = (Category)transaction2.getObject(CDOUtil.getCDOObject(category1A).cdoID(), true);
>- final Company company1B = (Company)transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true);
>+ final Category category1B = (Category)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(category1A)
>+ .cdoID(), true));
>+ final Company company1B = (Company)CDOUtil.getEObject(transaction2.getObject(
>+ CDOUtil.getCDOObject(companyA).cdoID(), true));
> 
> msg("Changing name");
> category1B.setName("CHANGED NAME");
>@@ -463,7 +468,8 @@
> 
> final CDOTransaction transaction2 = session2.openTransaction();
> 
>- final Company company1B = (Company)transaction2.getObject(CDOUtil.getCDOObject(companyA).cdoID(), true);
>+ final Company company1B = (Company)CDOUtil.getEObject(transaction2.getObject(
>+ CDOUtil.getCDOObject(companyA).cdoID(), true));
> 
> msg("Changing name");
> company1B.setName("TEST1");
>Index: src/org/eclipse/emf/cdo/tests/EnumTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java,v
>retrieving revision 1.7
>diff -u -r1.7 EnumTest.java
>--- src/org/eclipse/emf/cdo/tests/EnumTest.java	11 Apr 2009 18:31:33 -0000	1.7
>+++ src/org/eclipse/emf/cdo/tests/EnumTest.java	3 Jan 2010 09:57:50 -0000
>@@ -168,6 +168,8 @@
> CDOResource resource = transaction.getResource("/my/resource");
> Category category = (Category)resource.getContents().get(0);
> Product1 product = category.getProducts().get(0);
>+ System.out.println(VAT.VAT7 + "/" + product.getVat());
>+
> assertEquals(VAT.VAT7, product.getVat());
> 
> product.setVat(VAT.VAT15);
>Index: src/org/eclipse/emf/cdo/tests/InitialTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java,v
>retrieving revision 1.33
>diff -u -r1.33 InitialTest.java
>--- src/org/eclipse/emf/cdo/tests/InitialTest.java	28 Dec 2009 10:26:16 -0000	1.33
>+++ src/org/eclipse/emf/cdo/tests/InitialTest.java	3 Jan 2010 09:57:50 -0000
>@@ -767,7 +767,8 @@
> 
> msg("Opening transaction");
> transaction = session.openTransaction();
>- orderAddress = (OrderAddress)transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true);
>+ orderAddress = (OrderAddress)CDOUtil.getEObject(transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(),
>+ true));
> 
> assertEquals(2.8f, orderAddress.getPrice());
> assertEquals("ALLO", orderAddress.getCity());
>@@ -779,7 +780,8 @@
> session = openModel1Session();
> 
> transaction = session.openTransaction();
>- orderAddress = (OrderAddress)transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(), true);
>+ orderAddress = (OrderAddress)CDOUtil.getEObject(transaction.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(),
>+ true));
> 
> assertEquals(2.8f, orderAddress.getPrice());
> assertEquals("ALLO", orderAddress.getCity());
>Index: src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java,v
>retrieving revision 1.45
>diff -u -r1.45 PackageRegistryTest.java
>--- src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java	28 Dec 2009 10:26:17 -0000	1.45
>+++ src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java	3 Jan 2010 09:57:50 -0000
>@@ -392,7 +392,7 @@
> CDOTransaction transaction = session.openTransaction();
> CDOResource res = transaction.getResource("/res");
> 
>- CDOObject company = (CDOObject)res.getContents().get(0);
>+ CDOObject company = CDOUtil.getCDOObject(res.getContents().get(0));
> EClass companyClass = company.eClass();
> EAttribute nameAttribute = (EAttribute)companyClass.getEStructuralFeature("name");
> String name = (String)company.eGet(nameAttribute);
>@@ -425,7 +425,7 @@
> CDOTransaction transaction = session.openTransaction();
> CDOResource res = transaction.getResource("/res");
> 
>- CDOObject company = (CDOObject)res.getContents().get(0);
>+ CDOObject company = CDOUtil.getCDOObject(res.getContents().get(0));
> EClass companyClass = company.eClass();
> EAttribute nameAttribute = (EAttribute)companyClass.getEStructuralFeature("name");
> String name = (String)company.eGet(nameAttribute);
>Index: src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java,v
>retrieving revision 1.12
>diff -u -r1.12 Bugzilla_251087_Test.java
>--- src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java	28 Dec 2009 10:26:22 -0000	1.12
>+++ src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java	3 Jan 2010 09:57:51 -0000
>@@ -80,7 +80,7 @@
> 
> CDOTransaction transB1 = sessionB.openTransaction();
> CDOID companyID = CDOUtil.getCDOObject(obj2).cdoID();
>- Company companyB = (Company)transB1.getObject(companyID);
>+ Company companyB = (Company)CDOUtil.getEObject(transB1.getObject(companyID));
> sessionB.options().setPassiveUpdateEnabled(false);
> transB1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL);
> final TestAdapter testAdapter = new TestAdapter();
>Index: src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 Bugzilla_283985_SavePointTest.java
>--- src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java	7 Nov 2009 13:20:07 -0000	1.4
>+++ src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java	3 Jan 2010 09:57:52 -0000
>@@ -20,6 +20,7 @@
> import org.eclipse.emf.cdo.tests.model1.Order;
> import org.eclipse.emf.cdo.tests.model1.OrderDetail;
> import org.eclipse.emf.cdo.transaction.CDOTransaction;
>+import org.eclipse.emf.cdo.util.CDOUtil;
> 
> import org.eclipse.emf.spi.cdo.InternalCDOSavepoint;
> 
>@@ -76,7 +77,7 @@
> 
> public void test1()
> {
>- CDOID id = ((CDOObject)detail1).cdoID();
>+ CDOID id = CDOUtil.getCDOObject(detail1).cdoID();
> 
> order1.getOrderDetails().remove(detail1);
> assertTransient(detail1);
>@@ -86,7 +87,7 @@
> assertDirty(detail1, transaction);
> 
> transaction.commit();
>- assertEquals(id, ((CDOObject)detail1).cdoID());
>+ assertEquals(id, (CDOUtil.getCDOObject(detail1)).cdoID());
> assertEquals(detail1, transaction.getObject(id));
> assertClean(detail1, transaction);
> }
>@@ -116,7 +117,7 @@
> 
> public void test3()
> {
>- CDOID id = ((CDOObject)detail1).cdoID();
>+ CDOID id = CDOUtil.getCDOObject(detail1).cdoID();
> 
> transaction.setSavepoint();
> assertClean(detail1, transaction);
>Index: src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java,v
>retrieving revision 1.10
>diff -u -r1.10 Bugzilla_250910_Test.java
>--- src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java	28 Dec 2009 10:26:19 -0000	1.10
>+++ src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java	3 Jan 2010 09:57:51 -0000
>@@ -61,7 +61,7 @@
> transaction1.commit();
> 
> transaction2.options().setInvalidationNotificationEnabled(true);
>- Company company2 = (Company)transaction2.getObject(id, true);
>+ Company company2 = (Company)CDOUtil.getEObject(transaction2.getObject(id, true));
> company2.eAdapters().add(testAdapter);
> 
> transaction2.getLock().unlock();
>Index: src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java,v
>retrieving revision 1.5
>diff -u -r1.5 Bugzilla_260764_Test.java
>--- src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java	28 Dec 2009 10:26:18 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java	3 Jan 2010 09:57:51 -0000
>@@ -62,8 +62,8 @@
> session2.options().setPassiveUpdateEnabled(false);
> 
> final CDOTransaction transaction2 = session2.openTransaction();
>- final OrderAddress orderAddress2 = (OrderAddress)transaction2.getObject(CDOUtil.getCDOObject(orderAddress).cdoID(),
>- true);
>+ final OrderAddress orderAddress2 = (OrderAddress)CDOUtil.getEObject(transaction2.getObject(CDOUtil.getCDOObject(
>+ orderAddress).cdoID(), true));
> 
> OrderDetail orderDetail = getModel1Factory().createOrderDetail();
> orderAddress2.getOrderDetails().add(orderDetail);
>Index: src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 Bugzilla_283985_CDOTest.java
>--- src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java	7 Nov 2009 09:37:13 -0000	1.2
>+++ src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java	3 Jan 2010 09:57:52 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.emf.cdo.tests.model4.model4Package;
> import org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage;
> import org.eclipse.emf.cdo.transaction.CDOTransaction;
>+import org.eclipse.emf.cdo.util.CDOUtil;
> import org.eclipse.emf.cdo.util.ObjectNotFoundException;
> import org.eclipse.emf.cdo.view.CDOView;
> 
>@@ -221,8 +222,8 @@
> int i = 0;
> for (OrderDetail detail : details)
> {
>- cdoIDsBefore[i] = ((CDOObject)detail).cdoID();
>- versionsBefore[i] = ((CDOObject)detail).cdoRevision().getVersion();
>+ cdoIDsBefore[i] = CDOUtil.getCDOObject(detail).cdoID();
>+ versionsBefore[i] = CDOUtil.getCDOObject(detail).cdoRevision().getVersion();
> i++;
> }
> 
>@@ -241,11 +242,11 @@
> i = 0;
> for (OrderDetail detail : details)
> {
>- CDOID idAfter = ((CDOObject)detail).cdoID();
>+ CDOID idAfter = CDOUtil.getCDOObject(detail).cdoID();
> CDOID idBefore = cdoIDsBefore[i];
> assertEquals(idBefore, idAfter);
> 
>- int versionAfter = ((CDOObject)detail).cdoRevision().getVersion();
>+ int versionAfter = CDOUtil.getCDOObject(detail).cdoRevision().getVersion();
> int versionBefore = versionsBefore[i];
> assertEquals(versionBefore + 1, versionAfter);
> 
>@@ -259,11 +260,11 @@
> i = 0;
> for (OrderDetail detail : details)
> {
>- CDOID idAfter = ((CDOObject)detail).cdoID();
>+ CDOID idAfter = CDOUtil.getCDOObject(detail).cdoID();
> CDOID idBefore = cdoIDsBefore[i];
> assertEquals(idBefore, idAfter);
> 
>- int versionAfter = ((CDOObject)detail).cdoRevision().getVersion();
>+ int versionAfter = CDOUtil.getCDOObject(detail).cdoRevision().getVersion();
> int versionBefore = versionsBefore[i];
> assertEquals(versionBefore + 1, versionAfter);
> 
>@@ -362,7 +363,7 @@
> tx.commit();
> 
> order2.getOrderDetails().remove(detail1);
>- assertTrue(((CDOObject)detail1).cdoState() == CDOState.TRANSIENT);
>+ assertTrue((CDOUtil.getCDOObject(detail1)).cdoState() == CDOState.TRANSIENT);
> 
> boolean contains;
> 
>@@ -455,7 +456,7 @@
> tx.commit();
> assertSame(order1, detail1.eContainer());
> 
>- assertSame(CDOState.CLEAN, ((CDOObject)detail1).cdoState());
>+ assertSame(CDOState.CLEAN, CDOUtil.getCDOObject(detail1).cdoState());
> 
> // Drag and drop #3
> cmd = DragAndDropCommand.create(domain, order2, location, operations, operation, coll);
>Index: src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java,v
>retrieving revision 1.8
>diff -u -r1.8 ModelConfig.java
>--- src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java	27 Dec 2009 15:50:44 -0000	1.8
>+++ src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java	3 Jan 2010 09:57:52 -0000
>@@ -169,58 +169,42 @@
> 
> public Model2Factory getModel2Factory()
> {
>- // TODO: implement ModelConfig.Legacy.getModel2Factory()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory.eINSTANCE;
> }
> 
> public Model2Package getModel2Package()
> {
>- // TODO: implement ModelConfig.Legacy.getModel2Package()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model2.Model2Package.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model2.Model2Package.eINSTANCE;
> }
> 
> public Model3Factory getModel3Factory()
> {
>- // TODO: implement ModelConfig.Legacy.getModel3Factory()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory.eINSTANCE;
> }
> 
> public Model3Package getModel3Package()
> {
>- // TODO: implement ModelConfig.Legacy.getModel3Package()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model3.Model3Package.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model3.Model3Package.eINSTANCE;
> }
> 
> public SubpackageFactory getModel3SubPackageFactory()
> {
>- // TODO: implement ModelConfig.Legacy.getModel3SubPackageFactory()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory.eINSTANCE;
> }
> 
> public SubpackagePackage getModel3SubPackagePackage()
> {
>- // TODO: implement ModelConfig.Legacy.getModel3SubPackagePackage()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage.eINSTANCE;
> }
> 
> public model4Factory getModel4Factory()
> {
>- // TODO: implement ModelConfig.Legacy.getModel4Factory()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model4.model4Factory.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model4.model4Factory.eINSTANCE;
> }
> 
> public model4Package getModel4Package()
> {
>- // TODO: implement ModelConfig.Legacy.getModel4Package()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model4.model4Package.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model4.model4Package.eINSTANCE;
> }
> 
> public model4interfacesPackage getModel4InterfacesPackage()
>@@ -230,16 +214,12 @@
> 
> public Model5Factory getModel5Factory()
> {
>- // TODO: implement ModelConfig.Legacy.getModel5Factory()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory.eINSTANCE;
> }
> 
> public Model5Package getModel5Package()
> {
>- // TODO: implement ModelConfig.Legacy.getModel5Package()
>- throw new UnsupportedOperationException();
>- // return org.eclipse.emf.cdo.tests.legacy.model5.Model5Package.eINSTANCE;
>+ return org.eclipse.emf.cdo.tests.legacy.model5.Model5Package.eINSTANCE;
> }
> }
> }
>Index: src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java,v
>retrieving revision 1.19
>diff -u -r1.19 ConfigTest.java
>--- src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java	6 Nov 2009 18:11:50 -0000	1.19
>+++ src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java	3 Jan 2010 09:57:52 -0000
>@@ -475,12 +475,21 @@
> }
> }
> 
>- protected void skipConfig(Config config)
>+ protected boolean isConfig(Config config)
> {
>- skipTest(ObjectUtil.equals(getContainerConfig(), config) //
>+ return ObjectUtil.equals(getContainerConfig(), config) //
> || ObjectUtil.equals(getRepositoryConfig(), config) //
> || ObjectUtil.equals(getSessionConfig(), config) //
>- || ObjectUtil.equals(getModelConfig(), config));
>+ || ObjectUtil.equals(getModelConfig(), config);
>+ }
>+
>+ protected void skipConfig(Config config)
>+ {
>+ // skipTest(ObjectUtil.equals(getContainerConfig(), config) //
>+ // || ObjectUtil.equals(getRepositoryConfig(), config) //
>+ // || ObjectUtil.equals(getSessionConfig(), config) //
>+ // || ObjectUtil.equals(getModelConfig(), config));
>+ skipTest(isConfig(config));
> }
> 
> protected void skipUnlessConfig(Config config)
>#P org.eclipse.emf.cdo.formatchecker
>Index: src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/develop/incubation/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java,v
>retrieving revision 1.15
>diff -u -r1.15 FormatChecker.java
>--- src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java	25 Dec 2009 09:39:55 -0000	1.15
>+++ src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java	3 Jan 2010 09:57:54 -0000
>@@ -37,12 +37,66 @@
> {
> File folder = new File(args.length == 0 ? "/develop/ws/cdo" : args[0]);
> recurse(folder);
>+ ignores();
>+ report();
>+ }
> 
>- ignore("templates.MenuCardTemplate", 4);
>-
>+ private static void ignores()
>+ {
>+ ignore("base.BaseClass", 1);
>+ ignore("base.BaseFactory", 1);
>+ ignore("base.BasePackage", 2);
>+ ignore("base.impl.BaseClassImpl", 1);
>+ ignore("base.impl.BaseFactoryImpl", 2);
>+ ignore("base.impl.BasePackageImpl", 1);
>+ ignore("base.util.BaseAdapterFactory", 3);
>+ ignore("base.util.BaseSwitch", 2);
> ignore("com.swtdesigner.ResourceManager", 2);
> ignore("com.swtdesigner.SWTResourceManager", 2);
>-
>+ ignore("derived.DerivedClass", 1);
>+ ignore("derived.DerivedFactory", 1);
>+ ignore("derived.DerivedPackage", 2);
>+ ignore("derived.impl.DerivedClassImpl", 1);
>+ ignore("derived.impl.DerivedFactoryImpl", 2);
>+ ignore("derived.impl.DerivedPackageImpl", 1);
>+ ignore("derived.util.DerivedAdapterFactory", 3);
>+ ignore("derived.util.DerivedSwitch", 2);
>+ ignore("interface_.IInterface", 1);
>+ ignore("interface_.InterfaceFactory", 1);
>+ ignore("interface_.InterfacePackage", 2);
>+ ignore("interface_.impl.InterfaceFactoryImpl", 2);
>+ ignore("interface_.impl.InterfacePackageImpl", 1);
>+ ignore("interface_.util.InterfaceAdapterFactory", 3);
>+ ignore("interface_.util.InterfaceSwitch", 2);
>+ ignore("org.eclipse.emf.cdo.defs.CDOAuditDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.CDODefsFactory", 1);
>+ ignore("org.eclipse.emf.cdo.defs.CDODefsPackage", 2);
>+ ignore("org.eclipse.emf.cdo.defs.CDOPackageRegistryDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.CDOResourceDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.CDOSessionDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.CDOTransactionDef", 2);
>+ ignore("org.eclipse.emf.cdo.defs.CDOViewDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.EDynamicPackageDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.EPackageDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.FailOverStrategyDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.ResourceMode", 4);
>+ ignore("org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef", 1);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl", 5);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl", 2);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl", 1);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl", 1);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl", 9);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl", 8);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl", 10);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl", 2);
>+ ignore("org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl", 6);
>+ ignore("org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl", 5);
>+ ignore("org.eclipse.emf.cdo.defs.impl.EPackageDefImpl", 5);
>+ ignore("org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl", 6);
>+ ignore("org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl", 5);
>+ ignore("org.eclipse.emf.cdo.defs.util.CDODefsAdapterFactory", 3);
>+ ignore("org.eclipse.emf.cdo.defs.util.CDODefsSwitch", 2);
>+ ignore("org.eclipse.emf.cdo.defs.util.CDODefsUtil", 3);
> ignore("org.eclipse.emf.cdo.ecore.impl.CDOSuperAdapter", 1);
> ignore("org.eclipse.emf.cdo.ecore.impl.EAnnotationImpl", 5);
> ignore("org.eclipse.emf.cdo.ecore.impl.EAttributeImpl", 6);
>@@ -65,7 +119,38 @@
> ignore("org.eclipse.emf.cdo.ecore.impl.ETypedElementImpl", 4);
> ignore("org.eclipse.emf.cdo.ecore.impl.EcoreFactoryImpl", 9);
> ignore("org.eclipse.emf.cdo.ecore.impl.EcorePackageImpl", 3);
>-
>+ ignore("org.eclipse.emf.cdo.emodel.CDOAnnotation", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.CDOModelElement", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.CDONamedElement", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.EmodelFactory", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.EmodelPackage", 2);
>+ ignore("org.eclipse.emf.cdo.emodel.impl.CDOAnnotationImpl", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.impl.CDOModelElementImpl", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.impl.CDONamedElementImpl", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.impl.EmodelFactoryImpl", 2);
>+ ignore("org.eclipse.emf.cdo.emodel.impl.EmodelPackageImpl", 2);
>+ ignore("org.eclipse.emf.cdo.emodel.provider.CDOAnnotationItemProvider", 4);
>+ ignore("org.eclipse.emf.cdo.emodel.provider.CDOModelElementItemProvider", 5);
>+ ignore("org.eclipse.emf.cdo.emodel.provider.CDONamedElementItemProvider", 3);
>+ ignore("org.eclipse.emf.cdo.emodel.provider.EmodelEditPlugin", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.provider.EmodelItemProviderAdapterFactory", 1);
>+ ignore("org.eclipse.emf.cdo.emodel.util.EmodelAdapterFactory", 3);
>+ ignore("org.eclipse.emf.cdo.emodel.util.EmodelSwitch", 2);
>+ ignore("org.eclipse.emf.cdo.emodel.util.EmodelValidator", 2);
>+ ignore("org.eclipse.emf.cdo.eresource.CDOResource", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.CDOResourceFolder", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.CDOResourceNode", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.EresourceFactory", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.EresourcePackage", 2);
>+ ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 2);
>+ ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceFolderItemProvider", 5);
>+ ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceItemProvider", 4);
>+ ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceNodeItemProvider", 3);
>+ ignore("org.eclipse.emf.cdo.eresource.provider.EresourceEditPlugin", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory", 1);
>+ ignore("org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory", 3);
>+ ignore("org.eclipse.emf.cdo.eresource.util.EresourceSwitch", 2);
> ignore("org.eclipse.emf.cdo.examples.company.Address", 1);
> ignore("org.eclipse.emf.cdo.examples.company.Category", 1);
> ignore("org.eclipse.emf.cdo.examples.company.Company", 1);
>@@ -82,9 +167,9 @@
> ignore("org.eclipse.emf.cdo.examples.company.VAT", 4);
> ignore("org.eclipse.emf.cdo.examples.company.impl.AddressImpl", 1);
> ignore("org.eclipse.emf.cdo.examples.company.impl.CategoryImpl", 1);
>- ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyFactoryImpl", 3);
>+ ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyFactoryImpl", 2);
> ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyImpl", 1);
>- ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl", 3);
>+ ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl", 1);
> ignore("org.eclipse.emf.cdo.examples.company.impl.CustomerImpl", 1);
> ignore("org.eclipse.emf.cdo.examples.company.impl.OrderAddressImpl", 5);
> ignore("org.eclipse.emf.cdo.examples.company.impl.OrderDetailImpl", 1);
>@@ -107,211 +192,64 @@
> ignore("org.eclipse.emf.cdo.examples.company.provider.SalesOrderItemProvider", 3);
> ignore("org.eclipse.emf.cdo.examples.company.provider.SupplierItemProvider", 3);
> ignore("org.eclipse.emf.cdo.examples.company.util.CompanyAdapterFactory", 3);
>- ignore("org.eclipse.emf.cdo.examples.company.util.CompanySwitch", 21);
>-
>- ignore("org.eclipse.emf.cdo.emodel.CDOAnnotation", 1);
>- ignore("org.eclipse.emf.cdo.emodel.CDOModelElement", 1);
>- ignore("org.eclipse.emf.cdo.emodel.CDONamedElement", 1);
>- ignore("org.eclipse.emf.cdo.emodel.EmodelFactory", 1);
>- ignore("org.eclipse.emf.cdo.emodel.EmodelPackage", 2);
>- ignore("org.eclipse.emf.cdo.emodel.impl.CDOAnnotationImpl", 1);
>- ignore("org.eclipse.emf.cdo.emodel.impl.CDOModelElementImpl", 1);
>- ignore("org.eclipse.emf.cdo.emodel.impl.CDONamedElementImpl", 1);
>- ignore("org.eclipse.emf.cdo.emodel.impl.EmodelFactoryImpl", 2);
>- ignore("org.eclipse.emf.cdo.emodel.impl.EmodelPackageImpl", 2);
>- ignore("org.eclipse.emf.cdo.emodel.provider.CDOAnnotationItemProvider", 4);
>- ignore("org.eclipse.emf.cdo.emodel.provider.CDOModelElementItemProvider", 5);
>- ignore("org.eclipse.emf.cdo.emodel.provider.CDONamedElementItemProvider", 3);
>- ignore("org.eclipse.emf.cdo.emodel.provider.EmodelEditPlugin", 1);
>- ignore("org.eclipse.emf.cdo.emodel.provider.EmodelItemProviderAdapterFactory", 1);
>- ignore("org.eclipse.emf.cdo.emodel.util.EmodelAdapterFactory", 3);
>- ignore("org.eclipse.emf.cdo.emodel.util.EmodelSwitch", 2);
>- ignore("org.eclipse.emf.cdo.emodel.util.EmodelValidator", 2);
>-
>- ignore("org.eclipse.emf.cdo.eresource.CDOResource", 1);
>- ignore("org.eclipse.emf.cdo.eresource.CDOResourceFolder", 1);
>- ignore("org.eclipse.emf.cdo.eresource.CDOResourceNode", 1);
>- ignore("org.eclipse.emf.cdo.eresource.EresourceFactory", 1);
>- ignore("org.eclipse.emf.cdo.eresource.EresourcePackage", 2);
>- ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 2);
>- ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 1);
>- ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceFolderItemProvider", 5);
>- ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceItemProvider", 4);
>- ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceNodeItemProvider", 3);
>- ignore("org.eclipse.emf.cdo.eresource.provider.EresourceEditPlugin", 1);
>- ignore("org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory", 1);
>- ignore("org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory", 3);
>- ignore("org.eclipse.emf.cdo.eresource.util.EresourceSwitch", 2);
>-
>+ ignore("org.eclipse.emf.cdo.examples.company.util.CompanySwitch", 2);
> ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOActionBarContributor", 5);
> ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOEditor", 11);
> ignore("org.eclipse.emf.cdo.internal.ui.editor.PluginDelegator", 1);
>-
> ignore("org.eclipse.emf.cdo.server.file.FileStore", 1);
> ignore("org.eclipse.emf.cdo.server.file.FileStoreAccessor", 1);
>-
>- ignore("org.eclipse.net4j.util.ui.proposals.RegExContentProposalProvider", 11);
>- ignore("org.eclipse.net4j.util.ui.proposals.RegExMessages", 3);
>-
>- ignore("org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider", 1);
> ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.CDOBasicMapper", 1);
>- ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.CDOEFeatureAnnotator", 1);
> ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.CDOEntityMapper", 1);
>- ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.CDOManyAttributeMapper", 1);
> ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.CDOMappingContext", 1);
> ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.TeneoHibernateMappingProvider", 1);
> ignore("org.eclipse.emf.cdo.server.hibernate.internal.teneo.TeneoHibernateMappingProviderFactory", 1);
> ignore("org.eclipse.emf.cdo.server.hibernate.teneo.CDOHelper", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.AbstractFeatureMapTableMapping", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.AbstractListTableMapping", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.CDOHibernateConstants", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.ContainerInfoConverter", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.FileHibernateMappingProvider", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.FileHibernateMappingProviderFactory", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateCDOPackageUnitDTO", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateCommitContext", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateMappingProvider", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateQueryHandler", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateThreadContext", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateUtil", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.SystemInformation", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainerGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainerSetter", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOENumIntegerType", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOENumStringType", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDAnyUserType", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDExternalUserType", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDMetaRangeUserType", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDPropertyGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDPropertySetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOIDUserType", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOInterceptor", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOManyAttributeGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOManyAttributeSetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOManyReferenceGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOManyReferenceSetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOPropertyGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOPropertyHandler", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOPropertySetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOReferenceGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOReferenceSetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOResourceIDGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOResourceIDSetter", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOSyntheticIdPropertyHandler", 1);
> ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOSyntheticVersionPropertyHandler", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOTypeUserType", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOVersionPropertyGetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOVersionPropertySetter", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.HibernateMoveableListWrapper", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.PersistableListHolder", 1);
>- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.WrappedHibernateList", 1);
>-
>- ignore("org.eclipse.net4j.util.ui.proposals.RegExContentProposalProvider", 10);
>- ignore("org.eclipse.net4j.util.ui.proposals.RegExMessages", 2);
>-
>- //
>-
>- ignore("base.BaseClass", 1);
>- ignore("base.BaseFactory", 1);
>- ignore("base.BasePackage", 2);
>- ignore("base.impl.BaseClassImpl", 1);
>- ignore("base.impl.BaseFactoryImpl", 2);
>- ignore("base.impl.BasePackageImpl", 1);
>- ignore("base.util.BaseAdapterFactory", 3);
>- ignore("base.util.BaseSwitch", 2);
>- ignore("derived.DerivedClass", 1);
>- ignore("derived.DerivedFactory", 1);
>- ignore("derived.DerivedPackage", 2);
>- ignore("derived.impl.DerivedClassImpl", 1);
>- ignore("derived.impl.DerivedFactoryImpl", 2);
>- ignore("derived.impl.DerivedPackageImpl", 1);
>- ignore("derived.util.DerivedAdapterFactory", 3);
>- ignore("derived.util.DerivedSwitch", 2);
>- ignore("interface_.IInterface", 1);
>- ignore("interface_.InterfaceFactory", 1);
>- ignore("interface_.InterfacePackage", 2);
>- ignore("interface_.impl.InterfaceFactoryImpl", 2);
>- ignore("interface_.impl.InterfacePackageImpl", 1);
>- ignore("interface_.util.InterfaceAdapterFactory", 3);
>- ignore("interface_.util.InterfaceSwitch", 2);
>- ignore("org.eclipse.emf.cdo.defs.CDOAuditDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.CDODefsFactory", 1);
>- ignore("org.eclipse.emf.cdo.defs.CDODefsPackage", 2);
>- ignore("org.eclipse.emf.cdo.defs.CDOPackageRegistryDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.CDOResourceDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.CDOSessionDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.CDOTransactionDef", 2);
>- ignore("org.eclipse.emf.cdo.defs.CDOViewDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.EDynamicPackageDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.EPackageDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.FailOverStrategyDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.ResourceMode", 4);
>- ignore("org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef", 1);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl", 5);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl", 2);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl", 1);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl", 1);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl", 9);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl", 8);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl", 10);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl", 2);
>- ignore("org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl", 6);
>- ignore("org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl", 5);
>- ignore("org.eclipse.emf.cdo.defs.impl.EPackageDefImpl", 5);
>- ignore("org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl", 6);
>- ignore("org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl", 5);
>- ignore("org.eclipse.emf.cdo.defs.util.CDODefsAdapterFactory", 3);
>- ignore("org.eclipse.emf.cdo.defs.util.CDODefsSwitch", 2);
>- ignore("org.eclipse.emf.cdo.defs.util.CDODefsUtil", 3);
> ignore("org.eclipse.emf.cdo.tests.defs.CDOResourceDefImplTest", 1);
> ignore("org.eclipse.emf.cdo.tests.defs.CDOSessionDefImplTest", 1);
> ignore("org.eclipse.emf.cdo.tests.defs.CDOTransactionDefImplTest", 1);
> ignore("org.eclipse.emf.cdo.tests.defs.CDOViewDefImplTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.hibernate.HibernateBugzilla_258933_Test", 1);
>- ignore("org.eclipse.emf.cdo.tests.hibernate.HibernateMultiValuedOfAttributeTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.hibernate.HibernateQueryTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage", 2);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.Parameter", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing", 4);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.Value", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.ValueList", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl", 2);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.ParameterImpl", 5);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueImpl", 5);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.ValueListImpl", 6);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.util.MangoAdapterFactory", 3);
>- ignore("org.eclipse.emf.cdo.tests.legacy.mango.util.MangoSwitch", 2);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Address", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Category", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Company", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Customer", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl", 5);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl", 5);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl", 6);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory", 1);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.Model1Package", 2);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Order", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Product1", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.Supplier", 1);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.VAT", 4);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl", 5);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl", 8);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl", 11);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl", 8);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1FactoryImpl", 2);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl", 9);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1FactoryImpl", 3);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl", 3);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl", 15);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl", 10);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl", 8);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl", 8);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl", 9);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl", 8);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl", 14);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl", 9);
> ignore("org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl", 8);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.util.Model1AdapterFactory", 3);
>- ignore("org.eclipse.emf.cdo.tests.legacy.model1.util.Model1Switch", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.Model2Package", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2FactoryImpl", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl", 8);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl", 7);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl", 8);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl", 8);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl", 8);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl", 5);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl", 5);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.util.Model2AdapterFactory", 3);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model2.util.Model2Switch", 2);
> ignore("org.eclipse.emf.cdo.tests.legacy.model3.Class1", 1);
> ignore("org.eclipse.emf.cdo.tests.legacy.model3.MetaRef", 1);
> ignore("org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory", 1);
>@@ -330,6 +268,7 @@
> ignore("org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util.SubpackageSwitch", 2);
> ignore("org.eclipse.emf.cdo.tests.legacy.model3.util.Model3AdapterFactory", 3);
> ignore("org.eclipse.emf.cdo.tests.legacy.model3.util.Model3Switch", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory", 2);
> ignore("org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite", 1);
> ignore("org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained", 1);
> ignore("org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained", 1);
>@@ -411,17 +350,36 @@
> ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage", 2);
> ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesAdapterFactory", 3);
> ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesSwitch", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.Model5Package", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl", 6);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5FactoryImpl", 2);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl", 9);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.util.Model5AdapterFactory", 3);
>+ ignore("org.eclipse.emf.cdo.tests.legacy.model5.util.Model5Switch", 2);
> ignore("org.eclipse.emf.cdo.tests.mango.MangoFactory", 1);
> ignore("org.eclipse.emf.cdo.tests.mango.MangoPackage", 2);
>- ignore("org.eclipse.emf.cdo.tests.mango.Parameter", 1);
>+ ignore("org.eclipse.emf.cdo.tests.mango.MangoParameter", 1);
>+ ignore("org.eclipse.emf.cdo.tests.mango.MangoValue", 1);
>+ ignore("org.eclipse.emf.cdo.tests.mango.MangoValueList", 1);
> ignore("org.eclipse.emf.cdo.tests.mango.ParameterPassing", 4);
>- ignore("org.eclipse.emf.cdo.tests.mango.Value", 1);
>- ignore("org.eclipse.emf.cdo.tests.mango.ValueList", 1);
> ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl", 2);
> ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl", 1);
>- ignore("org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl", 1);
>- ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueImpl", 1);
>- ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.mango.util.MangoAdapterFactory", 3);
> ignore("org.eclipse.emf.cdo.tests.mango.util.MangoSwitch", 2);
> ignore("org.eclipse.emf.cdo.tests.model1.Address", 1);
>@@ -606,20 +564,20 @@
> ignore("org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.model1.util.Model1AdapterFactory", 3);
> ignore("org.eclipse.emf.cdo.tests.model1.util.Model1Switch", 2);
>- ignore("org.eclipse.emf.cdo.tests.model2.Unsettable1", 1);
>- ignore("org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.Model2Factory", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.Model2Package", 2);
> ignore("org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.Task", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.TaskContainer", 1);
>- ignore("org.eclipse.emf.cdo.tests.model2.impl.Unsettable1Impl", 1);
>- ignore("org.eclipse.emf.cdo.tests.model2.impl.Unsettable2WithDefaultImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.model2.Unsettable1", 1);
>+ ignore("org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2FactoryImpl", 2);
> ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskContainerImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskImpl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.model2.impl.Unsettable1Impl", 1);
>+ ignore("org.eclipse.emf.cdo.tests.model2.impl.Unsettable2WithDefaultImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.model2.util.Model2AdapterFactory", 3);
> ignore("org.eclipse.emf.cdo.tests.model2.util.Model2Switch", 2);
> ignore("org.eclipse.emf.cdo.tests.model3.Class1", 1);
>@@ -762,16 +720,6 @@
> ignore("org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl", 1);
> ignore("org.eclipse.emf.cdo.tests.model5.util.Model5AdapterFactory", 3);
> ignore("org.eclipse.emf.cdo.tests.model5.util.Model5Switch", 2);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.AbstractCDORevisionCacheTest", 7);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.AbstractDBRevisionCacheTest", 3);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.AllCDORevisionCacheTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.ConcurrentTestCaseRunner", 6);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.DefaultRevisionCacheTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.DerbyDBRevisionCacheTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.H2DBRevisionCacheTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.LRURevisionCacheTest", 1);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.MEMRevisionCacheTest", 2);
>- ignore("org.eclipse.emf.cdo.tests.revisioncache.Session", 2);
> ignore("org.eclipse.emf.cdo.ui.defs.CDOEditorDef", 1);
> ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory", 1);
> ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage", 2);
>@@ -893,6 +841,8 @@
> ignore("org.eclipse.net4j.util.tests.defs.util.DefsSwitch", 4);
> ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsAdapterFactory", 3);
> ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsSwitch", 2);
>+ ignore("org.eclipse.net4j.util.ui.proposals.RegExContentProposalProvider", 11);
>+ ignore("org.eclipse.net4j.util.ui.proposals.RegExMessages", 3);
> ignore("org.gastro.business.BusinessDay", 2);
> ignore("org.gastro.business.BusinessFactory", 2);
> ignore("org.gastro.business.BusinessPackage", 3);
>@@ -989,12 +939,7 @@
> ignore("reference.impl.ReferencePackageImpl", 1);
> ignore("reference.util.ReferenceAdapterFactory", 3);
> ignore("reference.util.ReferenceSwitch", 2);
>- ignore("templates.MenuCardTemplate", 2);
>- ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyFactoryImpl", 2);
>- ignore("org.eclipse.emf.cdo.examples.company.impl.CompanyPackageImpl", 1);
>- ignore("org.eclipse.emf.cdo.examples.company.util.CompanySwitch", 2);
>-
>- report();
>+ ignore("templates.MenuCardTemplate", 4);
> }
> 
> private static void recurse(File folder) throws IOException
>#P org.eclipse.emf.cdo.tests.model2
>Index: model/model2.legacy-genmodel
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model2/model/model2.legacy-genmodel,v
>retrieving revision 1.1
>diff -u -r1.1 model2.legacy-genmodel
>--- model/model2.legacy-genmodel	22 Aug 2009 09:34:23 -0000	1.1
>+++ model/model2.legacy-genmodel	3 Jan 2010 09:57:57 -0000
>@@ -5,7 +5,7 @@
> modelDirectory="/org.eclipse.emf.cdo.tests.model2/src" editDirectory="" editorDirectory=""
> modelPluginID="org.eclipse.emf.cdo.tests.model2" modelName="Model2" updateClasspath="false"
> codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
>- complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.cdo.tests.model1/model/model1.legacy.genmodel#//model1">
>+ complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel#//model1">
> <foreignModel>model2.ecore</foreignModel>
> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
> <genPackages prefix="Model2" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF,v
>retrieving revision 1.8
>diff -u -r1.8 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Jun 2009 07:25:23 -0000	1.8
>+++ META-INF/MANIFEST.MF	3 Jan 2010 09:57:57 -0000
>@@ -11,6 +11,7 @@
> org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
> org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
> org.eclipse.emf.cdo.tests.model1;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
>-Export-Package: org.eclipse.emf.cdo.tests.model2;version="3.0.0",
>+Export-Package: org.eclipse.emf.cdo.tests.legacy.model2,
>+ org.eclipse.emf.cdo.tests.model2;version="3.0.0",
> org.eclipse.emf.cdo.tests.model2.impl;version="3.0.0",
> org.eclipse.emf.cdo.tests.model2.util;version="3.0.0"
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Factory.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,113 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2;
>+
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable1;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
>+
>+/**
>+ * 
>+ * The Factory for the model.
>+ * It provides a create method for each non-abstract class of the model.
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package
>+ * @generated
>+ */
>+public interface Model2Factory extends org.eclipse.emf.cdo.tests.model2.Model2Factory
>+{
>+ /**
>+ * The singleton instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ Model2Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2FactoryImpl.init();
>+
>+ /**
>+ * Returns a new object of class 'Special Purchase Order'.
>+ * 
>+ * 
>+ * @return a new object of class 'Special Purchase Order'.
>+ * @generated
>+ */
>+ SpecialPurchaseOrder createSpecialPurchaseOrder();
>+
>+ /**
>+ * Returns a new object of class 'Task Container'.
>+ * 
>+ * 
>+ * @return a new object of class 'Task Container'.
>+ * @generated
>+ */
>+ TaskContainer createTaskContainer();
>+
>+ /**
>+ * Returns a new object of class 'Task'.
>+ * 
>+ * 
>+ * @return a new object of class 'Task'.
>+ * @generated
>+ */
>+ Task createTask();
>+
>+ /**
>+ * Returns a new object of class 'Unsettable1'.
>+ * 
>+ * 
>+ * @return a new object of class 'Unsettable1'.
>+ * @generated
>+ */
>+ Unsettable1 createUnsettable1();
>+
>+ /**
>+ * Returns a new object of class 'Unsettable2 With Default'.
>+ * 
>+ * 
>+ * @return a new object of class 'Unsettable2 With Default'.
>+ * @generated
>+ */
>+ Unsettable2WithDefault createUnsettable2WithDefault();
>+
>+ /**
>+ * Returns a new object of class 'Persistent Containment'.
>+ * 
>+ * 
>+ * @return a new object of class 'Persistent Containment'.
>+ * @generated
>+ */
>+ PersistentContainment createPersistentContainment();
>+
>+ /**
>+ * Returns a new object of class 'Transient Container'.
>+ * 
>+ * 
>+ * @return a new object of class 'Transient Container'.
>+ * @generated
>+ */
>+ TransientContainer createTransientContainer();
>+
>+ /**
>+ * Returns the package supported by this factory.
>+ * 
>+ * 
>+ * @return the package supported by this factory.
>+ * @generated
>+ */
>+ Model2Package getModel2Package();
>+
>+} //Model2Factory
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,336 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.util;
>+
>+import org.eclipse.emf.cdo.tests.model1.Order;
>+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable1;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EObject;
>+
>+import java.util.List;
>+
>+/**
>+ * 
>+ * The Switch 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.
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package
>+ * @generated
>+ */
>+public class Model2Switch<T>
>+{
>+ /**
>+ * The cached model package
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static Model2Package modelPackage;
>+
>+ /**
>+ * Creates an instance of the switch.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model2Switch()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = Model2Package.eINSTANCE;
>+ }
>+ }
>+
>+ /**
>+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @generated
>+ */
>+ protected T doSwitch(int classifierID, EObject theEObject)
>+ {
>+ switch (classifierID)
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER:
>+ {
>+ SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
>+ T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
>+ if (result == null)
>+ result = casePurchaseOrder(specialPurchaseOrder);
>+ if (result == null)
>+ result = caseOrder(specialPurchaseOrder);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model2Package.TASK_CONTAINER:
>+ {
>+ TaskContainer taskContainer = (TaskContainer)theEObject;
>+ T result = caseTaskContainer(taskContainer);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model2Package.TASK:
>+ {
>+ Task task = (Task)theEObject;
>+ T result = caseTask(task);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model2Package.UNSETTABLE1:
>+ {
>+ Unsettable1 unsettable1 = (Unsettable1)theEObject;
>+ T result = caseUnsettable1(unsettable1);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT:
>+ {
>+ Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject;
>+ T result = caseUnsettable2WithDefault(unsettable2WithDefault);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model2Package.PERSISTENT_CONTAINMENT:
>+ {
>+ PersistentContainment persistentContainment = (PersistentContainment)theEObject;
>+ T result = casePersistentContainment(persistentContainment);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model2Package.TRANSIENT_CONTAINER:
>+ {
>+ TransientContainer transientContainer = (TransientContainer)theEObject;
>+ T result = caseTransientContainer(transientContainer);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ default:
>+ return defaultCase(theEObject);
>+ }
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Special Purchase Order'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Special Purchase Order'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseSpecialPurchaseOrder(SpecialPurchaseOrder object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Task Container'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Task Container'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseTaskContainer(TaskContainer object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Task'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Task'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseTask(Task object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Unsettable1'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Unsettable1'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseUnsettable1(Unsettable1 object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Unsettable2 With Default'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Unsettable2 With Default'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseUnsettable2WithDefault(Unsettable2WithDefault object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Persistent Containment'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Persistent Containment'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T casePersistentContainment(PersistentContainment object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Transient Container'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Transient Container'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseTransientContainer(TransientContainer object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Order'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Order'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseOrder(Order object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Purchase Order'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Purchase Order'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T casePurchaseOrder(PurchaseOrder object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch, but this is the last case anyway.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'EObject'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>+ * @generated
>+ */
>+ public T defaultCase(EObject object)
>+ {
>+ return null;
>+ }
>+
>+} //Model2Switch
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskContainerImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,191 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Task Container'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl#getTasks Tasks}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class TaskContainerImpl extends EObjectImpl implements TaskContainer
>+{
>+ /**
>+ * The cached value of the '{@link #getTasks() Tasks}' containment reference list.
>+ * 
>+ * 
>+ * @see #getTasks()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Task> tasks;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected TaskContainerImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.TASK_CONTAINER;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Task> getTasks()
>+ {
>+ if (tasks == null)
>+ {
>+ tasks = new EObjectContainmentWithInverseEList<Task>(Task.class, this, Model2Package.TASK_CONTAINER__TASKS,
>+ Model2Package.TASK__TASK_CONTAINER);
>+ }
>+ return tasks;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK_CONTAINER__TASKS:
>+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getTasks()).basicAdd(otherEnd, msgs);
>+ }
>+ return super.eInverseAdd(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK_CONTAINER__TASKS:
>+ return ((InternalEList<?>)getTasks()).basicRemove(otherEnd, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK_CONTAINER__TASKS:
>+ return getTasks();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK_CONTAINER__TASKS:
>+ getTasks().clear();
>+ getTasks().addAll((Collection<? extends Task>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK_CONTAINER__TASKS:
>+ getTasks().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK_CONTAINER__TASKS:
>+ return tasks != null && !tasks.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+} //TaskContainerImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,323 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Persistent Containment'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl#getAttrBefore Attr Before}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl#getChildren Children}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl#getAttrAfter Attr After}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class PersistentContainmentImpl extends EObjectImpl implements PersistentContainment
>+{
>+ /**
>+ * The default value of the '{@link #getAttrBefore() Attr Before}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrBefore()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String ATTR_BEFORE_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getAttrBefore() Attr Before}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrBefore()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String attrBefore = ATTR_BEFORE_EDEFAULT;
>+
>+ /**
>+ * The cached value of the '{@link #getChildren() Children}' containment reference list.
>+ * 
>+ * 
>+ * @see #getChildren()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<TransientContainer> children;
>+
>+ /**
>+ * The default value of the '{@link #getAttrAfter() Attr After}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrAfter()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String ATTR_AFTER_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getAttrAfter() Attr After}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrAfter()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String attrAfter = ATTR_AFTER_EDEFAULT;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected PersistentContainmentImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.PERSISTENT_CONTAINMENT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getAttrBefore()
>+ {
>+ return attrBefore;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setAttrBefore(String newAttrBefore)
>+ {
>+ String oldAttrBefore = attrBefore;
>+ attrBefore = newAttrBefore;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE,
>+ oldAttrBefore, attrBefore));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<TransientContainer> getChildren()
>+ {
>+ if (children == null)
>+ {
>+ children = new EObjectContainmentWithInverseEList<TransientContainer>(TransientContainer.class, this,
>+ Model2Package.PERSISTENT_CONTAINMENT__CHILDREN, Model2Package.TRANSIENT_CONTAINER__PARENT);
>+ }
>+ return children;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getAttrAfter()
>+ {
>+ return attrAfter;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setAttrAfter(String newAttrAfter)
>+ {
>+ String oldAttrAfter = attrAfter;
>+ attrAfter = newAttrAfter;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER,
>+ oldAttrAfter, attrAfter));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.PERSISTENT_CONTAINMENT__CHILDREN:
>+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
>+ }
>+ return super.eInverseAdd(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.PERSISTENT_CONTAINMENT__CHILDREN:
>+ return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE:
>+ return getAttrBefore();
>+ case Model2Package.PERSISTENT_CONTAINMENT__CHILDREN:
>+ return getChildren();
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER:
>+ return getAttrAfter();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE:
>+ setAttrBefore((String)newValue);
>+ return;
>+ case Model2Package.PERSISTENT_CONTAINMENT__CHILDREN:
>+ getChildren().clear();
>+ getChildren().addAll((Collection<? extends TransientContainer>)newValue);
>+ return;
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER:
>+ setAttrAfter((String)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE:
>+ setAttrBefore(ATTR_BEFORE_EDEFAULT);
>+ return;
>+ case Model2Package.PERSISTENT_CONTAINMENT__CHILDREN:
>+ getChildren().clear();
>+ return;
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER:
>+ setAttrAfter(ATTR_AFTER_EDEFAULT);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE:
>+ return ATTR_BEFORE_EDEFAULT == null ? attrBefore != null : !ATTR_BEFORE_EDEFAULT.equals(attrBefore);
>+ case Model2Package.PERSISTENT_CONTAINMENT__CHILDREN:
>+ return children != null && !children.isEmpty();
>+ case Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER:
>+ return ATTR_AFTER_EDEFAULT == null ? attrAfter != null : !ATTR_AFTER_EDEFAULT.equals(attrAfter);
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (attrBefore: ");
>+ result.append(attrBefore);
>+ result.append(", attrAfter: ");
>+ result.append(attrAfter);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //PersistentContainmentImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,358 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Task'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl#getTaskContainer Task Container}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl#getDescription Description}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl#isDone Done}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class TaskImpl extends EObjectImpl implements Task
>+{
>+ /**
>+ * The default value of the '{@link #getDescription() Description}' attribute.
>+ * 
>+ * 
>+ * @see #getDescription()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String DESCRIPTION_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getDescription() Description}' attribute.
>+ * 
>+ * 
>+ * @see #getDescription()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String description = DESCRIPTION_EDEFAULT;
>+
>+ /**
>+ * The default value of the '{@link #isDone() Done}' attribute.
>+ * 
>+ * 
>+ * @see #isDone()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final boolean DONE_EDEFAULT = false;
>+
>+ /**
>+ * The cached value of the '{@link #isDone() Done}' attribute.
>+ * 
>+ * 
>+ * @see #isDone()
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean done = DONE_EDEFAULT;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected TaskImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.TASK;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TaskContainer getTaskContainer()
>+ {
>+ if (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER)
>+ return null;
>+ return (TaskContainer)eContainer();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetTaskContainer(TaskContainer newTaskContainer, NotificationChain msgs)
>+ {
>+ msgs = eBasicSetContainer((InternalEObject)newTaskContainer, Model2Package.TASK__TASK_CONTAINER, msgs);
>+ return msgs;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setTaskContainer(TaskContainer newTaskContainer)
>+ {
>+ if (newTaskContainer != eInternalContainer()
>+ || (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null))
>+ {
>+ if (EcoreUtil.isAncestor(this, newTaskContainer))
>+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+ NotificationChain msgs = null;
>+ if (eInternalContainer() != null)
>+ msgs = eBasicRemoveFromContainer(msgs);
>+ if (newTaskContainer != null)
>+ msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS,
>+ TaskContainer.class, msgs);
>+ msgs = basicSetTaskContainer(newTaskContainer, msgs);
>+ if (msgs != null)
>+ msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer,
>+ newTaskContainer));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getDescription()
>+ {
>+ return description;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setDescription(String newDescription)
>+ {
>+ String oldDescription = description;
>+ description = newDescription;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription,
>+ description));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isDone()
>+ {
>+ return done;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setDone(boolean newDone)
>+ {
>+ boolean oldDone = done;
>+ done = newDone;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DONE, oldDone, done));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ if (eInternalContainer() != null)
>+ msgs = eBasicRemoveFromContainer(msgs);
>+ return basicSetTaskContainer((TaskContainer)otherEnd, msgs);
>+ }
>+ return super.eInverseAdd(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ return basicSetTaskContainer(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
>+ {
>+ switch (eContainerFeatureID())
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ return eInternalContainer().eInverseRemove(this, Model2Package.TASK_CONTAINER__TASKS, TaskContainer.class, msgs);
>+ }
>+ return super.eBasicRemoveFromContainerFeature(msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ return getTaskContainer();
>+ case Model2Package.TASK__DESCRIPTION:
>+ return getDescription();
>+ case Model2Package.TASK__DONE:
>+ return isDone();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ setTaskContainer((TaskContainer)newValue);
>+ return;
>+ case Model2Package.TASK__DESCRIPTION:
>+ setDescription((String)newValue);
>+ return;
>+ case Model2Package.TASK__DONE:
>+ setDone((Boolean)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ setTaskContainer((TaskContainer)null);
>+ return;
>+ case Model2Package.TASK__DESCRIPTION:
>+ setDescription(DESCRIPTION_EDEFAULT);
>+ return;
>+ case Model2Package.TASK__DONE:
>+ setDone(DONE_EDEFAULT);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TASK__TASK_CONTAINER:
>+ return getTaskContainer() != null;
>+ case Model2Package.TASK__DESCRIPTION:
>+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
>+ case Model2Package.TASK__DONE:
>+ return done != DONE_EDEFAULT;
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (description: ");
>+ result.append(description);
>+ result.append(", done: ");
>+ result.append(done);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //TaskImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,809 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package;
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory;
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable1;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
>+
>+import org.eclipse.emf.ecore.EAttribute;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.EReference;
>+import org.eclipse.emf.ecore.impl.EPackageImpl;
>+
>+/**
>+ * 
>+ * An implementation of the model Package.
>+ * 
>+ * @generated
>+ */
>+public class Model2PackageImpl extends EPackageImpl implements Model2Package
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass specialPurchaseOrderEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass taskContainerEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass taskEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass unsettable1EClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass unsettable2WithDefaultEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass persistentContainmentEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass transientContainerEClass = null;
>+
>+ /**
>+ * Creates an instance of the model Package, registered with
>+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+ * package URI value.
>+ * Note: the correct way to create the package is via the static
>+ * factory method {@link #init init()}, which also performs
>+ * initialization of the package, or returns the registered package,
>+ * if one already exists.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.ecore.EPackage.Registry
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package#eNS_URI
>+ * @see #init()
>+ * @generated
>+ */
>+ private Model2PackageImpl()
>+ {
>+ super(eNS_URI, Model2Factory.eINSTANCE);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static boolean isInited = false;
>+
>+ /**
>+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+ * 
>+ * This method is used to initialize {@link Model2Package#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
>+ * @see #eNS_URI
>+ * @see #createPackageContents()
>+ * @see #initializePackageContents()
>+ * @generated
>+ */
>+ public static Model2Package init()
>+ {
>+ if (isInited)
>+ return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI);
>+
>+ // Obtain or create and register package
>+ Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE
>+ .get(eNS_URI)
>+ : new Model2PackageImpl());
>+
>+ isInited = true;
>+
>+ // Initialize simple dependencies
>+ Model1Package.eINSTANCE.eClass();
>+
>+ // Create package meta-data objects
>+ theModel2Package.createPackageContents();
>+
>+ // Initialize created meta-data
>+ theModel2Package.initializePackageContents();
>+
>+ // Mark meta-data to indicate it can't be changed
>+ theModel2Package.freeze();
>+
>+ // Update the registry and return the package
>+ EPackage.Registry.INSTANCE.put(Model2Package.eNS_URI, theModel2Package);
>+ return theModel2Package;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getSpecialPurchaseOrder()
>+ {
>+ return specialPurchaseOrderEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getSpecialPurchaseOrder_DiscountCode()
>+ {
>+ return (EAttribute)specialPurchaseOrderEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getSpecialPurchaseOrder_ShippingAddress()
>+ {
>+ return (EReference)specialPurchaseOrderEClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getTaskContainer()
>+ {
>+ return taskContainerEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTaskContainer_Tasks()
>+ {
>+ return (EReference)taskContainerEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getTask()
>+ {
>+ return taskEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTask_TaskContainer()
>+ {
>+ return (EReference)taskEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getTask_Description()
>+ {
>+ return (EAttribute)taskEClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getTask_Done()
>+ {
>+ return (EAttribute)taskEClass.getEStructuralFeatures().get(2);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getUnsettable1()
>+ {
>+ return unsettable1EClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableBoolean()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableByte()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableChar()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(2);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableDate()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(3);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableDouble()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(4);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableFloat()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(5);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableInt()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(6);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableLong()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(7);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableShort()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(8);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableString()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(9);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable1_UnsettableVAT()
>+ {
>+ return (EAttribute)unsettable1EClass.getEStructuralFeatures().get(10);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getUnsettable2WithDefault()
>+ {
>+ return unsettable2WithDefaultEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableBoolean()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableByte()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableChar()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(2);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableDate()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(3);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableDouble()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(4);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableFloat()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(5);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableInt()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(6);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableLong()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(7);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableShort()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(8);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableString()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(9);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getUnsettable2WithDefault_UnsettableVAT()
>+ {
>+ return (EAttribute)unsettable2WithDefaultEClass.getEStructuralFeatures().get(10);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getPersistentContainment()
>+ {
>+ return persistentContainmentEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getPersistentContainment_AttrBefore()
>+ {
>+ return (EAttribute)persistentContainmentEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getPersistentContainment_Children()
>+ {
>+ return (EReference)persistentContainmentEClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getPersistentContainment_AttrAfter()
>+ {
>+ return (EAttribute)persistentContainmentEClass.getEStructuralFeatures().get(2);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getTransientContainer()
>+ {
>+ return transientContainerEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getTransientContainer_AttrBefore()
>+ {
>+ return (EAttribute)transientContainerEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTransientContainer_Parent()
>+ {
>+ return (EReference)transientContainerEClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getTransientContainer_AttrAfter()
>+ {
>+ return (EAttribute)transientContainerEClass.getEStructuralFeatures().get(2);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model2Factory getModel2Factory()
>+ {
>+ return (Model2Factory)getEFactoryInstance();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void createPackageContents()
>+ {
>+ if (isCreated)
>+ return;
>+ isCreated = true;
>+
>+ // Create classes and their features
>+ specialPurchaseOrderEClass = createEClass(SPECIAL_PURCHASE_ORDER);
>+ createEAttribute(specialPurchaseOrderEClass, SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE);
>+ createEReference(specialPurchaseOrderEClass, SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS);
>+
>+ taskContainerEClass = createEClass(TASK_CONTAINER);
>+ createEReference(taskContainerEClass, TASK_CONTAINER__TASKS);
>+
>+ taskEClass = createEClass(TASK);
>+ createEReference(taskEClass, TASK__TASK_CONTAINER);
>+ createEAttribute(taskEClass, TASK__DESCRIPTION);
>+ createEAttribute(taskEClass, TASK__DONE);
>+
>+ unsettable1EClass = createEClass(UNSETTABLE1);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_BOOLEAN);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_BYTE);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_CHAR);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_DATE);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_DOUBLE);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_FLOAT);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_INT);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_LONG);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_SHORT);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_STRING);
>+ createEAttribute(unsettable1EClass, UNSETTABLE1__UNSETTABLE_VAT);
>+
>+ unsettable2WithDefaultEClass = createEClass(UNSETTABLE2_WITH_DEFAULT);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING);
>+ createEAttribute(unsettable2WithDefaultEClass, UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT);
>+
>+ persistentContainmentEClass = createEClass(PERSISTENT_CONTAINMENT);
>+ createEAttribute(persistentContainmentEClass, PERSISTENT_CONTAINMENT__ATTR_BEFORE);
>+ createEReference(persistentContainmentEClass, PERSISTENT_CONTAINMENT__CHILDREN);
>+ createEAttribute(persistentContainmentEClass, PERSISTENT_CONTAINMENT__ATTR_AFTER);
>+
>+ transientContainerEClass = createEClass(TRANSIENT_CONTAINER);
>+ createEAttribute(transientContainerEClass, TRANSIENT_CONTAINER__ATTR_BEFORE);
>+ createEReference(transientContainerEClass, TRANSIENT_CONTAINER__PARENT);
>+ createEAttribute(transientContainerEClass, TRANSIENT_CONTAINER__ATTR_AFTER);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void initializePackageContents()
>+ {
>+ if (isInitialized)
>+ return;
>+ isInitialized = true;
>+
>+ // Initialize package
>+ setName(eNAME);
>+ setNsPrefix(eNS_PREFIX);
>+ setNsURI(eNS_URI);
>+
>+ // Obtain other dependent packages
>+ Model1Package theModel1Package = (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
>+
>+ // Create type parameters
>+
>+ // Set bounds for type parameters
>+
>+ // Add supertypes to classes
>+ specialPurchaseOrderEClass.getESuperTypes().add(theModel1Package.getPurchaseOrder());
>+
>+ // Initialize classes and features; add operations and parameters
>+ initEClass(specialPurchaseOrderEClass, SpecialPurchaseOrder.class, "SpecialPurchaseOrder", !IS_ABSTRACT,
>+ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getSpecialPurchaseOrder_DiscountCode(), ecorePackage.getEString(), "discountCode", null, 0, 1,
>+ SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEReference(getSpecialPurchaseOrder_ShippingAddress(), theModel1Package.getAddress(), null, "shippingAddress",
>+ null, 0, 1, SpecialPurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
>+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1,
>+ TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
>+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer",
>+ null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
>+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class,
>+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT,
>+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(unsettable1EClass, Unsettable1.class, "Unsettable1", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getUnsettable1_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableString(), ecorePackage.getEString(), "unsettableString", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getUnsettable1_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", null, 0, 1,
>+ Unsettable1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+
>+ initEClass(unsettable2WithDefaultEClass, Unsettable2WithDefault.class, "Unsettable2WithDefault", !IS_ABSTRACT,
>+ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableBoolean(), ecorePackage.getEBoolean(), "unsettableBoolean",
>+ "true", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
>+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1,
>+ Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0,
>+ 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate",
>+ "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
>+ IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableDouble(), ecorePackage.getEDouble(), "unsettableDouble", "3.3",
>+ 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID,
>+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableFloat(), ecorePackage.getEFloat(), "unsettableFloat", "4.4", 0,
>+ 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableInt(), ecorePackage.getEInt(), "unsettableInt", "5", 0, 1,
>+ Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableLong(), ecorePackage.getELong(), "unsettableLong", "6", 0, 1,
>+ Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableShort(), ecorePackage.getEShort(), "unsettableShort", "7", 0, 1,
>+ Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString",
>+ "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
>+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "VAT15", 0,
>+ 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT,
>+ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
>+ PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEReference(getPersistentContainment_Children(), this.getTransientContainer(), this
>+ .getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT,
>+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
>+ !IS_ORDERED);
>+ initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
>+ PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(transientContainerEClass, TransientContainer.class, "TransientContainer", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1,
>+ TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), this
>+ .getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT,
>+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
>+ IS_ORDERED);
>+ initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1,
>+ TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ // Create resource
>+ createResource(eNS_URI);
>+ }
>+
>+} //Model2PackageImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1200 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.model1.VAT;
>+import org.eclipse.emf.cdo.tests.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable1;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import java.util.Date;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Unsettable1'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#isUnsettableBoolean Unsettable Boolean}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableByte Unsettable Byte}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableChar Unsettable Char}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableDate Unsettable Date}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableDouble Unsettable Double}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableFloat Unsettable Float}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableInt Unsettable Int}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableLong Unsettable Long}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableShort Unsettable Short}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableString Unsettable String}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl#getUnsettableVAT Unsettable VAT}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class Unsettable1Impl extends EObjectImpl implements Unsettable1
>+{
>+ /**
>+ * The default value of the '{@link #isUnsettableBoolean() Unsettable Boolean}' attribute.
>+ * 
>+ * 
>+ * @see #isUnsettableBoolean()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final boolean UNSETTABLE_BOOLEAN_EDEFAULT = false;
>+
>+ /**
>+ * The cached value of the '{@link #isUnsettableBoolean() Unsettable Boolean}' attribute.
>+ * 
>+ * 
>+ * @see #isUnsettableBoolean()
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Boolean attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableBooleanESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableByte() Unsettable Byte}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableByte()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final byte UNSETTABLE_BYTE_EDEFAULT = 0x00;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableByte() Unsettable Byte}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableByte()
>+ * @generated
>+ * @ordered
>+ */
>+ protected byte unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Byte attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableByteESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableChar() Unsettable Char}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableChar()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final char UNSETTABLE_CHAR_EDEFAULT = '\u0000';
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableChar() Unsettable Char}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableChar()
>+ * @generated
>+ * @ordered
>+ */
>+ protected char unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Char attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableCharESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableDate() Unsettable Date}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDate()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final Date UNSETTABLE_DATE_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableDate() Unsettable Date}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDate()
>+ * @generated
>+ * @ordered
>+ */
>+ protected Date unsettableDate = UNSETTABLE_DATE_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Date attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableDateESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableDouble() Unsettable Double}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDouble()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final double UNSETTABLE_DOUBLE_EDEFAULT = 0.0;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableDouble() Unsettable Double}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDouble()
>+ * @generated
>+ * @ordered
>+ */
>+ protected double unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Double attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableDoubleESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableFloat() Unsettable Float}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableFloat()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final float UNSETTABLE_FLOAT_EDEFAULT = 0.0F;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableFloat() Unsettable Float}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableFloat()
>+ * @generated
>+ * @ordered
>+ */
>+ protected float unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Float attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableFloatESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableInt() Unsettable Int}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableInt()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final int UNSETTABLE_INT_EDEFAULT = 0;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableInt() Unsettable Int}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableInt()
>+ * @generated
>+ * @ordered
>+ */
>+ protected int unsettableInt = UNSETTABLE_INT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Int attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableIntESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableLong() Unsettable Long}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableLong()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final long UNSETTABLE_LONG_EDEFAULT = 0L;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableLong() Unsettable Long}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableLong()
>+ * @generated
>+ * @ordered
>+ */
>+ protected long unsettableLong = UNSETTABLE_LONG_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Long attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableLongESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableShort() Unsettable Short}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableShort()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final short UNSETTABLE_SHORT_EDEFAULT = 0;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableShort() Unsettable Short}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableShort()
>+ * @generated
>+ * @ordered
>+ */
>+ protected short unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Short attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableShortESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableString() Unsettable String}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableString()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String UNSETTABLE_STRING_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableString() Unsettable String}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableString()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String unsettableString = UNSETTABLE_STRING_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable String attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableStringESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableVAT() Unsettable VAT}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableVAT()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final VAT UNSETTABLE_VAT_EDEFAULT = VAT.VAT0;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableVAT() Unsettable VAT}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableVAT()
>+ * @generated
>+ * @ordered
>+ */
>+ protected VAT unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable VAT attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableVATESet;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected Unsettable1Impl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.UNSETTABLE1;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isUnsettableBoolean()
>+ {
>+ return unsettableBoolean;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableBoolean(boolean newUnsettableBoolean)
>+ {
>+ boolean oldUnsettableBoolean = unsettableBoolean;
>+ unsettableBoolean = newUnsettableBoolean;
>+ boolean oldUnsettableBooleanESet = unsettableBooleanESet;
>+ unsettableBooleanESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
>+ oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableBoolean()
>+ {
>+ boolean oldUnsettableBoolean = unsettableBoolean;
>+ boolean oldUnsettableBooleanESet = unsettableBooleanESet;
>+ unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
>+ unsettableBooleanESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN,
>+ oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableBoolean()
>+ {
>+ return unsettableBooleanESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public byte getUnsettableByte()
>+ {
>+ return unsettableByte;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableByte(byte newUnsettableByte)
>+ {
>+ byte oldUnsettableByte = unsettableByte;
>+ unsettableByte = newUnsettableByte;
>+ boolean oldUnsettableByteESet = unsettableByteESet;
>+ unsettableByteESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
>+ oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableByte()
>+ {
>+ byte oldUnsettableByte = unsettableByte;
>+ boolean oldUnsettableByteESet = unsettableByteESet;
>+ unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
>+ unsettableByteESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE,
>+ oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableByte()
>+ {
>+ return unsettableByteESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public char getUnsettableChar()
>+ {
>+ return unsettableChar;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableChar(char newUnsettableChar)
>+ {
>+ char oldUnsettableChar = unsettableChar;
>+ unsettableChar = newUnsettableChar;
>+ boolean oldUnsettableCharESet = unsettableCharESet;
>+ unsettableCharESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
>+ oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableChar()
>+ {
>+ char oldUnsettableChar = unsettableChar;
>+ boolean oldUnsettableCharESet = unsettableCharESet;
>+ unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
>+ unsettableCharESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR,
>+ oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableChar()
>+ {
>+ return unsettableCharESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Date getUnsettableDate()
>+ {
>+ return unsettableDate;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableDate(Date newUnsettableDate)
>+ {
>+ Date oldUnsettableDate = unsettableDate;
>+ unsettableDate = newUnsettableDate;
>+ boolean oldUnsettableDateESet = unsettableDateESet;
>+ unsettableDateESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
>+ oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableDate()
>+ {
>+ Date oldUnsettableDate = unsettableDate;
>+ boolean oldUnsettableDateESet = unsettableDateESet;
>+ unsettableDate = UNSETTABLE_DATE_EDEFAULT;
>+ unsettableDateESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE,
>+ oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableDate()
>+ {
>+ return unsettableDateESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public double getUnsettableDouble()
>+ {
>+ return unsettableDouble;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableDouble(double newUnsettableDouble)
>+ {
>+ double oldUnsettableDouble = unsettableDouble;
>+ unsettableDouble = newUnsettableDouble;
>+ boolean oldUnsettableDoubleESet = unsettableDoubleESet;
>+ unsettableDoubleESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
>+ oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableDouble()
>+ {
>+ double oldUnsettableDouble = unsettableDouble;
>+ boolean oldUnsettableDoubleESet = unsettableDoubleESet;
>+ unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
>+ unsettableDoubleESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE,
>+ oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableDouble()
>+ {
>+ return unsettableDoubleESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public float getUnsettableFloat()
>+ {
>+ return unsettableFloat;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableFloat(float newUnsettableFloat)
>+ {
>+ float oldUnsettableFloat = unsettableFloat;
>+ unsettableFloat = newUnsettableFloat;
>+ boolean oldUnsettableFloatESet = unsettableFloatESet;
>+ unsettableFloatESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
>+ oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableFloat()
>+ {
>+ float oldUnsettableFloat = unsettableFloat;
>+ boolean oldUnsettableFloatESet = unsettableFloatESet;
>+ unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
>+ unsettableFloatESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT,
>+ oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableFloat()
>+ {
>+ return unsettableFloatESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getUnsettableInt()
>+ {
>+ return unsettableInt;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableInt(int newUnsettableInt)
>+ {
>+ int oldUnsettableInt = unsettableInt;
>+ unsettableInt = newUnsettableInt;
>+ boolean oldUnsettableIntESet = unsettableIntESet;
>+ unsettableIntESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
>+ oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableInt()
>+ {
>+ int oldUnsettableInt = unsettableInt;
>+ boolean oldUnsettableIntESet = unsettableIntESet;
>+ unsettableInt = UNSETTABLE_INT_EDEFAULT;
>+ unsettableIntESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT,
>+ oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableInt()
>+ {
>+ return unsettableIntESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public long getUnsettableLong()
>+ {
>+ return unsettableLong;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableLong(long newUnsettableLong)
>+ {
>+ long oldUnsettableLong = unsettableLong;
>+ unsettableLong = newUnsettableLong;
>+ boolean oldUnsettableLongESet = unsettableLongESet;
>+ unsettableLongESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
>+ oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableLong()
>+ {
>+ long oldUnsettableLong = unsettableLong;
>+ boolean oldUnsettableLongESet = unsettableLongESet;
>+ unsettableLong = UNSETTABLE_LONG_EDEFAULT;
>+ unsettableLongESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG,
>+ oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableLong()
>+ {
>+ return unsettableLongESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public short getUnsettableShort()
>+ {
>+ return unsettableShort;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableShort(short newUnsettableShort)
>+ {
>+ short oldUnsettableShort = unsettableShort;
>+ unsettableShort = newUnsettableShort;
>+ boolean oldUnsettableShortESet = unsettableShortESet;
>+ unsettableShortESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
>+ oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableShort()
>+ {
>+ short oldUnsettableShort = unsettableShort;
>+ boolean oldUnsettableShortESet = unsettableShortESet;
>+ unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
>+ unsettableShortESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT,
>+ oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableShort()
>+ {
>+ return unsettableShortESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getUnsettableString()
>+ {
>+ return unsettableString;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableString(String newUnsettableString)
>+ {
>+ String oldUnsettableString = unsettableString;
>+ unsettableString = newUnsettableString;
>+ boolean oldUnsettableStringESet = unsettableStringESet;
>+ unsettableStringESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
>+ oldUnsettableString, unsettableString, !oldUnsettableStringESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableString()
>+ {
>+ String oldUnsettableString = unsettableString;
>+ boolean oldUnsettableStringESet = unsettableStringESet;
>+ unsettableString = UNSETTABLE_STRING_EDEFAULT;
>+ unsettableStringESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING,
>+ oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableString()
>+ {
>+ return unsettableStringESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public VAT getUnsettableVAT()
>+ {
>+ return unsettableVAT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableVAT(VAT newUnsettableVAT)
>+ {
>+ VAT oldUnsettableVAT = unsettableVAT;
>+ unsettableVAT = newUnsettableVAT == null ? UNSETTABLE_VAT_EDEFAULT : newUnsettableVAT;
>+ boolean oldUnsettableVATESet = unsettableVATESet;
>+ unsettableVATESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
>+ oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableVAT()
>+ {
>+ VAT oldUnsettableVAT = unsettableVAT;
>+ boolean oldUnsettableVATESet = unsettableVATESet;
>+ unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
>+ unsettableVATESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT,
>+ oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableVAT()
>+ {
>+ return unsettableVATESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN:
>+ return isUnsettableBoolean();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BYTE:
>+ return getUnsettableByte();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_CHAR:
>+ return getUnsettableChar();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DATE:
>+ return getUnsettableDate();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE:
>+ return getUnsettableDouble();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT:
>+ return getUnsettableFloat();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_INT:
>+ return getUnsettableInt();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_LONG:
>+ return getUnsettableLong();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_SHORT:
>+ return getUnsettableShort();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_STRING:
>+ return getUnsettableString();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_VAT:
>+ return getUnsettableVAT();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN:
>+ setUnsettableBoolean((Boolean)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BYTE:
>+ setUnsettableByte((Byte)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_CHAR:
>+ setUnsettableChar((Character)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DATE:
>+ setUnsettableDate((Date)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE:
>+ setUnsettableDouble((Double)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT:
>+ setUnsettableFloat((Float)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_INT:
>+ setUnsettableInt((Integer)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_LONG:
>+ setUnsettableLong((Long)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_SHORT:
>+ setUnsettableShort((Short)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_STRING:
>+ setUnsettableString((String)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_VAT:
>+ setUnsettableVAT((VAT)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN:
>+ unsetUnsettableBoolean();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BYTE:
>+ unsetUnsettableByte();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_CHAR:
>+ unsetUnsettableChar();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DATE:
>+ unsetUnsettableDate();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE:
>+ unsetUnsettableDouble();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT:
>+ unsetUnsettableFloat();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_INT:
>+ unsetUnsettableInt();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_LONG:
>+ unsetUnsettableLong();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_SHORT:
>+ unsetUnsettableShort();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_STRING:
>+ unsetUnsettableString();
>+ return;
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_VAT:
>+ unsetUnsettableVAT();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN:
>+ return isSetUnsettableBoolean();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_BYTE:
>+ return isSetUnsettableByte();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_CHAR:
>+ return isSetUnsettableChar();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DATE:
>+ return isSetUnsettableDate();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE:
>+ return isSetUnsettableDouble();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT:
>+ return isSetUnsettableFloat();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_INT:
>+ return isSetUnsettableInt();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_LONG:
>+ return isSetUnsettableLong();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_SHORT:
>+ return isSetUnsettableShort();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_STRING:
>+ return isSetUnsettableString();
>+ case Model2Package.UNSETTABLE1__UNSETTABLE_VAT:
>+ return isSetUnsettableVAT();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (unsettableBoolean: ");
>+ if (unsettableBooleanESet)
>+ result.append(unsettableBoolean);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableByte: ");
>+ if (unsettableByteESet)
>+ result.append(unsettableByte);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableChar: ");
>+ if (unsettableCharESet)
>+ result.append(unsettableChar);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableDate: ");
>+ if (unsettableDateESet)
>+ result.append(unsettableDate);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableDouble: ");
>+ if (unsettableDoubleESet)
>+ result.append(unsettableDouble);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableFloat: ");
>+ if (unsettableFloatESet)
>+ result.append(unsettableFloat);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableInt: ");
>+ if (unsettableIntESet)
>+ result.append(unsettableInt);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableLong: ");
>+ if (unsettableLongESet)
>+ result.append(unsettableLong);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableShort: ");
>+ if (unsettableShortESet)
>+ result.append(unsettableShort);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableString: ");
>+ if (unsettableStringESet)
>+ result.append(unsettableString);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableVAT: ");
>+ if (unsettableVATESet)
>+ result.append(unsettableVAT);
>+ else
>+ result.append("<unset>");
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //Unsettable1Impl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,316 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.util;
>+
>+import org.eclipse.emf.cdo.tests.model1.Order;
>+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable1;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
>+
>+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;
>+
>+/**
>+ * 
>+ * The Adapter Factory for the model.
>+ * It provides an adapter <code>createXXX</code> method for each class of the model.
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Package
>+ * @generated
>+ */
>+public class Model2AdapterFactory extends AdapterFactoryImpl
>+{
>+ /**
>+ * The cached model package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static Model2Package modelPackage;
>+
>+ /**
>+ * Creates an instance of the adapter factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model2AdapterFactory()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = Model2Package.eINSTANCE;
>+ }
>+ }
>+
>+ /**
>+ * Returns whether this factory is applicable for the type of the object.
>+ * 
>+ * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected Model2Switch<Adapter> modelSwitch = new Model2Switch<Adapter>()
>+ {
>+ @Override
>+ public Adapter caseSpecialPurchaseOrder(SpecialPurchaseOrder object)
>+ {
>+ return createSpecialPurchaseOrderAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseTaskContainer(TaskContainer object)
>+ {
>+ return createTaskContainerAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseTask(Task object)
>+ {
>+ return createTaskAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseUnsettable1(Unsettable1 object)
>+ {
>+ return createUnsettable1Adapter();
>+ }
>+
>+ @Override
>+ public Adapter caseUnsettable2WithDefault(Unsettable2WithDefault object)
>+ {
>+ return createUnsettable2WithDefaultAdapter();
>+ }
>+
>+ @Override
>+ public Adapter casePersistentContainment(PersistentContainment object)
>+ {
>+ return createPersistentContainmentAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseTransientContainer(TransientContainer object)
>+ {
>+ return createTransientContainerAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseOrder(Order object)
>+ {
>+ return createOrderAdapter();
>+ }
>+
>+ @Override
>+ public Adapter casePurchaseOrder(PurchaseOrder object)
>+ {
>+ return createPurchaseOrderAdapter();
>+ }
>+
>+ @Override
>+ public Adapter defaultCase(EObject object)
>+ {
>+ return createEObjectAdapter();
>+ }
>+ };
>+
>+ /**
>+ * Creates an adapter for the <code>target</code>.
>+ * 
>+ * 
>+ * @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.legacy.model2.SpecialPurchaseOrder Special Purchase Order}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder
>+ * @generated
>+ */
>+ public Adapter createSpecialPurchaseOrderAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer Task Container}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer
>+ * @generated
>+ */
>+ public Adapter createTaskContainerAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task Task}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Task
>+ * @generated
>+ */
>+ public Adapter createTaskAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1 Unsettable1}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1
>+ * @generated
>+ */
>+ public Adapter createUnsettable1Adapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault Unsettable2 With Default}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault
>+ * @generated
>+ */
>+ public Adapter createUnsettable2WithDefaultAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment Persistent Containment}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment
>+ * @generated
>+ */
>+ public Adapter createPersistentContainmentAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer Transient Container}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer
>+ * @generated
>+ */
>+ public Adapter createTransientContainerAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order Order}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model1.Order
>+ * @generated
>+ */
>+ public Adapter createOrderAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder Purchase Order}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder
>+ * @generated
>+ */
>+ public Adapter createPurchaseOrderAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for the default case.
>+ * 
>+ * This default implementation returns null.
>+ * 
>+ * @return the new adapter.
>+ * @generated
>+ */
>+ public Adapter createEObjectAdapter()
>+ {
>+ return null;
>+ }
>+
>+} //Model2AdapterFactory
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,360 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Transient Container'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl#getAttrBefore Attr Before}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl#getParent Parent}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl#getAttrAfter Attr After}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class TransientContainerImpl extends EObjectImpl implements TransientContainer
>+{
>+ /**
>+ * The default value of the '{@link #getAttrBefore() Attr Before}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrBefore()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String ATTR_BEFORE_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getAttrBefore() Attr Before}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrBefore()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String attrBefore = ATTR_BEFORE_EDEFAULT;
>+
>+ /**
>+ * The default value of the '{@link #getAttrAfter() Attr After}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrAfter()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String ATTR_AFTER_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getAttrAfter() Attr After}' attribute.
>+ * 
>+ * 
>+ * @see #getAttrAfter()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String attrAfter = ATTR_AFTER_EDEFAULT;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected TransientContainerImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.TRANSIENT_CONTAINER;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getAttrBefore()
>+ {
>+ return attrBefore;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setAttrBefore(String newAttrBefore)
>+ {
>+ String oldAttrBefore = attrBefore;
>+ attrBefore = newAttrBefore;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE,
>+ oldAttrBefore, attrBefore));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public PersistentContainment getParent()
>+ {
>+ if (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT)
>+ return null;
>+ return (PersistentContainment)eContainer();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetParent(PersistentContainment newParent, NotificationChain msgs)
>+ {
>+ msgs = eBasicSetContainer((InternalEObject)newParent, Model2Package.TRANSIENT_CONTAINER__PARENT, msgs);
>+ return msgs;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setParent(PersistentContainment newParent)
>+ {
>+ if (newParent != eInternalContainer()
>+ || (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null))
>+ {
>+ if (EcoreUtil.isAncestor(this, newParent))
>+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+ NotificationChain msgs = null;
>+ if (eInternalContainer() != null)
>+ msgs = eBasicRemoveFromContainer(msgs);
>+ if (newParent != null)
>+ msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
>+ PersistentContainment.class, msgs);
>+ msgs = basicSetParent(newParent, msgs);
>+ if (msgs != null)
>+ msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent,
>+ newParent));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getAttrAfter()
>+ {
>+ return attrAfter;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setAttrAfter(String newAttrAfter)
>+ {
>+ String oldAttrAfter = attrAfter;
>+ attrAfter = newAttrAfter;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER,
>+ oldAttrAfter, attrAfter));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ if (eInternalContainer() != null)
>+ msgs = eBasicRemoveFromContainer(msgs);
>+ return basicSetParent((PersistentContainment)otherEnd, msgs);
>+ }
>+ return super.eInverseAdd(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ return basicSetParent(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
>+ {
>+ switch (eContainerFeatureID())
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ return eInternalContainer().eInverseRemove(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN,
>+ PersistentContainment.class, msgs);
>+ }
>+ return super.eBasicRemoveFromContainerFeature(msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE:
>+ return getAttrBefore();
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ return getParent();
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER:
>+ return getAttrAfter();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE:
>+ setAttrBefore((String)newValue);
>+ return;
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ setParent((PersistentContainment)newValue);
>+ return;
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER:
>+ setAttrAfter((String)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE:
>+ setAttrBefore(ATTR_BEFORE_EDEFAULT);
>+ return;
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ setParent((PersistentContainment)null);
>+ return;
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER:
>+ setAttrAfter(ATTR_AFTER_EDEFAULT);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE:
>+ return ATTR_BEFORE_EDEFAULT == null ? attrBefore != null : !ATTR_BEFORE_EDEFAULT.equals(attrBefore);
>+ case Model2Package.TRANSIENT_CONTAINER__PARENT:
>+ return getParent() != null;
>+ case Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER:
>+ return ATTR_AFTER_EDEFAULT == null ? attrAfter != null : !ATTR_AFTER_EDEFAULT.equals(attrAfter);
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (attrBefore: ");
>+ result.append(attrBefore);
>+ result.append(", attrAfter: ");
>+ result.append(attrAfter);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //TransientContainerImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2FactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,202 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory;
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
>+import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
>+import org.eclipse.emf.cdo.tests.model2.Task;
>+import org.eclipse.emf.cdo.tests.model2.TaskContainer;
>+import org.eclipse.emf.cdo.tests.model2.TransientContainer;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable1;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.impl.EFactoryImpl;
>+import org.eclipse.emf.ecore.plugin.EcorePlugin;
>+
>+/**
>+ * 
>+ * An implementation of the model Factory.
>+ * 
>+ * @generated
>+ */
>+public class Model2FactoryImpl extends EFactoryImpl implements Model2Factory
>+{
>+ /**
>+ * Creates the default factory implementation.
>+ * 
>+ * 
>+ * @generated NOT
>+ */
>+ public static Model2Factory init()
>+ {
>+ try
>+ {
>+ Model2Factory theModel2Factory = (Model2Factory)EPackage.Registry.INSTANCE
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model2/1.0.0");
>+ if (theModel2Factory != null)
>+ {
>+ return theModel2Factory;
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ EcorePlugin.INSTANCE.log(exception);
>+ }
>+ return new Model2FactoryImpl();
>+ }
>+
>+ /**
>+ * Creates an instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model2FactoryImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public EObject create(EClass eClass)
>+ {
>+ switch (eClass.getClassifierID())
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER:
>+ return createSpecialPurchaseOrder();
>+ case Model2Package.TASK_CONTAINER:
>+ return createTaskContainer();
>+ case Model2Package.TASK:
>+ return createTask();
>+ case Model2Package.UNSETTABLE1:
>+ return createUnsettable1();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT:
>+ return createUnsettable2WithDefault();
>+ case Model2Package.PERSISTENT_CONTAINMENT:
>+ return createPersistentContainment();
>+ case Model2Package.TRANSIENT_CONTAINER:
>+ return createTransientContainer();
>+ default:
>+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>+ }
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public SpecialPurchaseOrder createSpecialPurchaseOrder()
>+ {
>+ SpecialPurchaseOrderImpl specialPurchaseOrder = new SpecialPurchaseOrderImpl();
>+ return specialPurchaseOrder;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TaskContainer createTaskContainer()
>+ {
>+ TaskContainerImpl taskContainer = new TaskContainerImpl();
>+ return taskContainer;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Task createTask()
>+ {
>+ TaskImpl task = new TaskImpl();
>+ return task;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Unsettable1 createUnsettable1()
>+ {
>+ Unsettable1Impl unsettable1 = new Unsettable1Impl();
>+ return unsettable1;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Unsettable2WithDefault createUnsettable2WithDefault()
>+ {
>+ Unsettable2WithDefaultImpl unsettable2WithDefault = new Unsettable2WithDefaultImpl();
>+ return unsettable2WithDefault;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public PersistentContainment createPersistentContainment()
>+ {
>+ PersistentContainmentImpl persistentContainment = new PersistentContainmentImpl();
>+ return persistentContainment;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TransientContainer createTransientContainer()
>+ {
>+ TransientContainerImpl transientContainer = new TransientContainerImpl();
>+ return transientContainer;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model2Package getModel2Package()
>+ {
>+ return (Model2Package)getEPackage();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @deprecated
>+ * @generated
>+ */
>+ @Deprecated
>+ public static Model2Package getPackage()
>+ {
>+ return Model2Package.eINSTANCE;
>+ }
>+
>+} //Model2FactoryImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,283 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl;
>+import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model1.Address;
>+import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Special Purchase Order'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl#getDiscountCode Discount Code}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl#getShippingAddress Shipping Address}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements SpecialPurchaseOrder
>+{
>+ /**
>+ * The default value of the '{@link #getDiscountCode() Discount Code}' attribute.
>+ * 
>+ * 
>+ * @see #getDiscountCode()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String DISCOUNT_CODE_EDEFAULT = null;
>+
>+ /**
>+ * The cached value of the '{@link #getDiscountCode() Discount Code}' attribute.
>+ * 
>+ * 
>+ * @see #getDiscountCode()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String discountCode = DISCOUNT_CODE_EDEFAULT;
>+
>+ /**
>+ * The cached value of the '{@link #getShippingAddress() Shipping Address}' containment reference.
>+ * 
>+ * 
>+ * @see #getShippingAddress()
>+ * @generated
>+ * @ordered
>+ */
>+ protected Address shippingAddress;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected SpecialPurchaseOrderImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.SPECIAL_PURCHASE_ORDER;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getDiscountCode()
>+ {
>+ return discountCode;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setDiscountCode(String newDiscountCode)
>+ {
>+ String oldDiscountCode = discountCode;
>+ discountCode = newDiscountCode;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE,
>+ oldDiscountCode, discountCode));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Address getShippingAddress()
>+ {
>+ return shippingAddress;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public NotificationChain basicSetShippingAddress(Address newShippingAddress, NotificationChain msgs)
>+ {
>+ Address oldShippingAddress = shippingAddress;
>+ shippingAddress = newShippingAddress;
>+ if (eNotificationRequired())
>+ {
>+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
>+ Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress, newShippingAddress);
>+ if (msgs == null)
>+ msgs = notification;
>+ else
>+ msgs.add(notification);
>+ }
>+ return msgs;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setShippingAddress(Address newShippingAddress)
>+ {
>+ if (newShippingAddress != shippingAddress)
>+ {
>+ NotificationChain msgs = null;
>+ if (shippingAddress != null)
>+ msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
>+ - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
>+ if (newShippingAddress != null)
>+ msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
>+ - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs);
>+ msgs = basicSetShippingAddress(newShippingAddress, msgs);
>+ if (msgs != null)
>+ msgs.dispatch();
>+ }
>+ else if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS,
>+ newShippingAddress, newShippingAddress));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS:
>+ return basicSetShippingAddress(null, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE:
>+ return getDiscountCode();
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS:
>+ return getShippingAddress();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE:
>+ setDiscountCode((String)newValue);
>+ return;
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS:
>+ setShippingAddress((Address)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE:
>+ setDiscountCode(DISCOUNT_CODE_EDEFAULT);
>+ return;
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS:
>+ setShippingAddress((Address)null);
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE:
>+ return DISCOUNT_CODE_EDEFAULT == null ? discountCode != null : !DISCOUNT_CODE_EDEFAULT.equals(discountCode);
>+ case Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS:
>+ return shippingAddress != null;
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (discountCode: ");
>+ result.append(discountCode);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //SpecialPurchaseOrderImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1348 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package;
>+
>+import org.eclipse.emf.ecore.EAttribute;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.EReference;
>+
>+/**
>+ * 
>+ * The Package for the model.
>+ * It contains accessors for the meta objects to represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory
>+ * @model kind="package"
>+ * @generated
>+ */
>+public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Package
>+{
>+ /**
>+ * The package name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNAME = "model2";
>+
>+ /**
>+ * The package namespace URI.
>+ * 
>+ * 
>+ * @generated NOT
>+ */
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model2/1.0.0";
>+
>+ /**
>+ * The package namespace name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_PREFIX = "model2";
>+
>+ /**
>+ * The singleton instance of the package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ Model2Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl.init();
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl Special Purchase Order}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder()
>+ * @generated
>+ */
>+ int SPECIAL_PURCHASE_ORDER = 0;
>+
>+ /**
>+ * The feature id for the 'Order Details' containment reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int SPECIAL_PURCHASE_ORDER__ORDER_DETAILS = Model1Package.PURCHASE_ORDER__ORDER_DETAILS;
>+
>+ /**
>+ * The feature id for the 'Date' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int SPECIAL_PURCHASE_ORDER__DATE = Model1Package.PURCHASE_ORDER__DATE;
>+
>+ /**
>+ * The feature id for the 'Supplier' reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int SPECIAL_PURCHASE_ORDER__SUPPLIER = Model1Package.PURCHASE_ORDER__SUPPLIER;
>+
>+ /**
>+ * The feature id for the 'Discount Code' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = Model1Package.PURCHASE_ORDER_FEATURE_COUNT + 0;
>+
>+ /**
>+ * The feature id for the 'Shipping Address' containment reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = Model1Package.PURCHASE_ORDER_FEATURE_COUNT + 1;
>+
>+ /**
>+ * The number of structural features of the 'Special Purchase Order' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int SPECIAL_PURCHASE_ORDER_FEATURE_COUNT = Model1Package.PURCHASE_ORDER_FEATURE_COUNT + 2;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl Task Container}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTaskContainer()
>+ * @generated
>+ */
>+ int TASK_CONTAINER = 1;
>+
>+ /**
>+ * The feature id for the 'Tasks' containment reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TASK_CONTAINER__TASKS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Task Container' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TASK_CONTAINER_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl Task}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTask()
>+ * @generated
>+ */
>+ int TASK = 2;
>+
>+ /**
>+ * The feature id for the 'Task Container' container reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TASK__TASK_CONTAINER = 0;
>+
>+ /**
>+ * The feature id for the 'Description' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TASK__DESCRIPTION = 1;
>+
>+ /**
>+ * The feature id for the 'Done' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TASK__DONE = 2;
>+
>+ /**
>+ * The number of structural features of the 'Task' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TASK_FEATURE_COUNT = 3;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl Unsettable1}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable1()
>+ * @generated
>+ */
>+ int UNSETTABLE1 = 3;
>+
>+ /**
>+ * The feature id for the 'Unsettable Boolean' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_BOOLEAN = 0;
>+
>+ /**
>+ * The feature id for the 'Unsettable Byte' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_BYTE = 1;
>+
>+ /**
>+ * The feature id for the 'Unsettable Char' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_CHAR = 2;
>+
>+ /**
>+ * The feature id for the 'Unsettable Date' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_DATE = 3;
>+
>+ /**
>+ * The feature id for the 'Unsettable Double' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_DOUBLE = 4;
>+
>+ /**
>+ * The feature id for the 'Unsettable Float' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_FLOAT = 5;
>+
>+ /**
>+ * The feature id for the 'Unsettable Int' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_INT = 6;
>+
>+ /**
>+ * The feature id for the 'Unsettable Long' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_LONG = 7;
>+
>+ /**
>+ * The feature id for the 'Unsettable Short' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_SHORT = 8;
>+
>+ /**
>+ * The feature id for the 'Unsettable String' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_STRING = 9;
>+
>+ /**
>+ * The feature id for the 'Unsettable VAT' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1__UNSETTABLE_VAT = 10;
>+
>+ /**
>+ * The number of structural features of the 'Unsettable1' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE1_FEATURE_COUNT = 11;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl Unsettable2 With Default}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT = 4;
>+
>+ /**
>+ * The feature id for the 'Unsettable Boolean' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN = 0;
>+
>+ /**
>+ * The feature id for the 'Unsettable Byte' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE = 1;
>+
>+ /**
>+ * The feature id for the 'Unsettable Char' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR = 2;
>+
>+ /**
>+ * The feature id for the 'Unsettable Date' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE = 3;
>+
>+ /**
>+ * The feature id for the 'Unsettable Double' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE = 4;
>+
>+ /**
>+ * The feature id for the 'Unsettable Float' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT = 5;
>+
>+ /**
>+ * The feature id for the 'Unsettable Int' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT = 6;
>+
>+ /**
>+ * The feature id for the 'Unsettable Long' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG = 7;
>+
>+ /**
>+ * The feature id for the 'Unsettable Short' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT = 8;
>+
>+ /**
>+ * The feature id for the 'Unsettable String' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING = 9;
>+
>+ /**
>+ * The feature id for the 'Unsettable VAT' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT = 10;
>+
>+ /**
>+ * The number of structural features of the 'Unsettable2 With Default' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int UNSETTABLE2_WITH_DEFAULT_FEATURE_COUNT = 11;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl Persistent Containment}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getPersistentContainment()
>+ * @generated
>+ */
>+ int PERSISTENT_CONTAINMENT = 5;
>+
>+ /**
>+ * The feature id for the 'Attr Before' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PERSISTENT_CONTAINMENT__ATTR_BEFORE = 0;
>+
>+ /**
>+ * The feature id for the 'Children' containment reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PERSISTENT_CONTAINMENT__CHILDREN = 1;
>+
>+ /**
>+ * The feature id for the 'Attr After' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PERSISTENT_CONTAINMENT__ATTR_AFTER = 2;
>+
>+ /**
>+ * The number of structural features of the 'Persistent Containment' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int PERSISTENT_CONTAINMENT_FEATURE_COUNT = 3;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl Transient Container}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTransientContainer()
>+ * @generated
>+ */
>+ int TRANSIENT_CONTAINER = 6;
>+
>+ /**
>+ * The feature id for the 'Attr Before' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TRANSIENT_CONTAINER__ATTR_BEFORE = 0;
>+
>+ /**
>+ * The feature id for the 'Parent' container reference.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TRANSIENT_CONTAINER__PARENT = 1;
>+
>+ /**
>+ * The feature id for the 'Attr After' attribute.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TRANSIENT_CONTAINER__ATTR_AFTER = 2;
>+
>+ /**
>+ * The number of structural features of the 'Transient Container' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TRANSIENT_CONTAINER_FEATURE_COUNT = 3;
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder Special Purchase Order}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Special Purchase Order'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder
>+ * @generated
>+ */
>+ EClass getSpecialPurchaseOrder();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getDiscountCode Discount Code}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Discount Code'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getDiscountCode()
>+ * @see #getSpecialPurchaseOrder()
>+ * @generated
>+ */
>+ EAttribute getSpecialPurchaseOrder_DiscountCode();
>+
>+ /**
>+ * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getShippingAddress Shipping Address}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference 'Shipping Address'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.SpecialPurchaseOrder#getShippingAddress()
>+ * @see #getSpecialPurchaseOrder()
>+ * @generated
>+ */
>+ EReference getSpecialPurchaseOrder_ShippingAddress();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer Task Container}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Task Container'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer
>+ * @generated
>+ */
>+ EClass getTaskContainer();
>+
>+ /**
>+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer#getTasks Tasks}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference list 'Tasks'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer#getTasks()
>+ * @see #getTaskContainer()
>+ * @generated
>+ */
>+ EReference getTaskContainer_Tasks();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task Task}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Task'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Task
>+ * @generated
>+ */
>+ EClass getTask();
>+
>+ /**
>+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task#getTaskContainer Task Container}'.
>+ * 
>+ * 
>+ * @return the meta object for the container reference 'Task Container'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Task#getTaskContainer()
>+ * @see #getTask()
>+ * @generated
>+ */
>+ EReference getTask_TaskContainer();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task#getDescription Description}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Description'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Task#getDescription()
>+ * @see #getTask()
>+ * @generated
>+ */
>+ EAttribute getTask_Description();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task#isDone Done}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Done'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Task#isDone()
>+ * @see #getTask()
>+ * @generated
>+ */
>+ EAttribute getTask_Done();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1 Unsettable1}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Unsettable1'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1
>+ * @generated
>+ */
>+ EClass getUnsettable1();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#isUnsettableBoolean Unsettable Boolean}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Boolean'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#isUnsettableBoolean()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableBoolean();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableByte Unsettable Byte}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Byte'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableByte()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableByte();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableChar Unsettable Char}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Char'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableChar()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableChar();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDate Unsettable Date}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Date'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDate()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableDate();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDouble Unsettable Double}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Double'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableDouble()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableDouble();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableFloat Unsettable Float}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Float'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableFloat()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableFloat();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableInt Unsettable Int}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Int'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableInt()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableInt();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableLong Unsettable Long}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Long'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableLong()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableLong();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableShort Unsettable Short}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Short'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableShort()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableShort();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableString Unsettable String}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable String'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableString()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableString();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableVAT Unsettable VAT}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable VAT'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1#getUnsettableVAT()
>+ * @see #getUnsettable1()
>+ * @generated
>+ */
>+ EAttribute getUnsettable1_UnsettableVAT();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault Unsettable2 With Default}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Unsettable2 With Default'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault
>+ * @generated
>+ */
>+ EClass getUnsettable2WithDefault();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#isUnsettableBoolean Unsettable Boolean}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Boolean'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#isUnsettableBoolean()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableBoolean();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableByte Unsettable Byte}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Byte'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableByte()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableByte();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableChar Unsettable Char}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Char'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableChar()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableChar();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDate Unsettable Date}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Date'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDate()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableDate();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDouble Unsettable Double}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Double'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableDouble()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableDouble();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableFloat Unsettable Float}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Float'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableFloat()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableFloat();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableInt Unsettable Int}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Int'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableInt()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableInt();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableLong Unsettable Long}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Long'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableLong()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableLong();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableShort Unsettable Short}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable Short'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableShort()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableShort();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableString Unsettable String}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable String'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableString()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableString();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableVAT Unsettable VAT}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Unsettable VAT'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault#getUnsettableVAT()
>+ * @see #getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EAttribute getUnsettable2WithDefault_UnsettableVAT();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment Persistent Containment}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Persistent Containment'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment
>+ * @generated
>+ */
>+ EClass getPersistentContainment();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrBefore Attr Before}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Attr Before'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrBefore()
>+ * @see #getPersistentContainment()
>+ * @generated
>+ */
>+ EAttribute getPersistentContainment_AttrBefore();
>+
>+ /**
>+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getChildren Children}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference list 'Children'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getChildren()
>+ * @see #getPersistentContainment()
>+ * @generated
>+ */
>+ EReference getPersistentContainment_Children();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrAfter Attr After}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Attr After'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment#getAttrAfter()
>+ * @see #getPersistentContainment()
>+ * @generated
>+ */
>+ EAttribute getPersistentContainment_AttrAfter();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer Transient Container}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Transient Container'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer
>+ * @generated
>+ */
>+ EClass getTransientContainer();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrBefore Attr Before}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Attr Before'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrBefore()
>+ * @see #getTransientContainer()
>+ * @generated
>+ */
>+ EAttribute getTransientContainer_AttrBefore();
>+
>+ /**
>+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getParent Parent}'.
>+ * 
>+ * 
>+ * @return the meta object for the container reference 'Parent'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getParent()
>+ * @see #getTransientContainer()
>+ * @generated
>+ */
>+ EReference getTransientContainer_Parent();
>+
>+ /**
>+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrAfter Attr After}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute 'Attr After'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer#getAttrAfter()
>+ * @see #getTransientContainer()
>+ * @generated
>+ */
>+ EAttribute getTransientContainer_AttrAfter();
>+
>+ /**
>+ * Returns the factory that creates the instances of the model.
>+ * 
>+ * 
>+ * @return the factory that creates the instances of the model.
>+ * @generated
>+ */
>+ Model2Factory getModel2Factory();
>+
>+ /**
>+ * 
>+ * Defines literals for the meta objects that represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @generated
>+ */
>+ interface Literals
>+ {
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl Special Purchase Order}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder()
>+ * @generated
>+ */
>+ EClass SPECIAL_PURCHASE_ORDER = eINSTANCE.getSpecialPurchaseOrder();
>+
>+ /**
>+ * The meta object literal for the 'Discount Code' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = eINSTANCE.getSpecialPurchaseOrder_DiscountCode();
>+
>+ /**
>+ * The meta object literal for the 'Shipping Address' containment reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = eINSTANCE.getSpecialPurchaseOrder_ShippingAddress();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl Task Container}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTaskContainer()
>+ * @generated
>+ */
>+ EClass TASK_CONTAINER = eINSTANCE.getTaskContainer();
>+
>+ /**
>+ * The meta object literal for the 'Tasks' containment reference list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TASK_CONTAINER__TASKS = eINSTANCE.getTaskContainer_Tasks();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl Task}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTask()
>+ * @generated
>+ */
>+ EClass TASK = eINSTANCE.getTask();
>+
>+ /**
>+ * The meta object literal for the 'Task Container' container reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TASK__TASK_CONTAINER = eINSTANCE.getTask_TaskContainer();
>+
>+ /**
>+ * The meta object literal for the 'Description' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute TASK__DESCRIPTION = eINSTANCE.getTask_Description();
>+
>+ /**
>+ * The meta object literal for the 'Done' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute TASK__DONE = eINSTANCE.getTask_Done();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl Unsettable1}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable1()
>+ * @generated
>+ */
>+ EClass UNSETTABLE1 = eINSTANCE.getUnsettable1();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Boolean' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable1_UnsettableBoolean();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Byte' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_BYTE = eINSTANCE.getUnsettable1_UnsettableByte();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Char' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_CHAR = eINSTANCE.getUnsettable1_UnsettableChar();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Date' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_DATE = eINSTANCE.getUnsettable1_UnsettableDate();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Double' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable1_UnsettableDouble();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Float' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable1_UnsettableFloat();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Int' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_INT = eINSTANCE.getUnsettable1_UnsettableInt();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Long' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_LONG = eINSTANCE.getUnsettable1_UnsettableLong();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Short' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_SHORT = eINSTANCE.getUnsettable1_UnsettableShort();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable String' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_STRING = eINSTANCE.getUnsettable1_UnsettableString();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable VAT' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE1__UNSETTABLE_VAT = eINSTANCE.getUnsettable1_UnsettableVAT();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl Unsettable2 With Default}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable2WithDefault()
>+ * @generated
>+ */
>+ EClass UNSETTABLE2_WITH_DEFAULT = eINSTANCE.getUnsettable2WithDefault();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Boolean' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Byte' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE = eINSTANCE.getUnsettable2WithDefault_UnsettableByte();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Char' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR = eINSTANCE.getUnsettable2WithDefault_UnsettableChar();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Date' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE = eINSTANCE.getUnsettable2WithDefault_UnsettableDate();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Double' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable2WithDefault_UnsettableDouble();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Float' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable2WithDefault_UnsettableFloat();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Int' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT = eINSTANCE.getUnsettable2WithDefault_UnsettableInt();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Long' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG = eINSTANCE.getUnsettable2WithDefault_UnsettableLong();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable Short' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT = eINSTANCE.getUnsettable2WithDefault_UnsettableShort();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable String' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING = eINSTANCE.getUnsettable2WithDefault_UnsettableString();
>+
>+ /**
>+ * The meta object literal for the 'Unsettable VAT' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT = eINSTANCE.getUnsettable2WithDefault_UnsettableVAT();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl Persistent Containment}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getPersistentContainment()
>+ * @generated
>+ */
>+ EClass PERSISTENT_CONTAINMENT = eINSTANCE.getPersistentContainment();
>+
>+ /**
>+ * The meta object literal for the 'Attr Before' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute PERSISTENT_CONTAINMENT__ATTR_BEFORE = eINSTANCE.getPersistentContainment_AttrBefore();
>+
>+ /**
>+ * The meta object literal for the 'Children' containment reference list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference PERSISTENT_CONTAINMENT__CHILDREN = eINSTANCE.getPersistentContainment_Children();
>+
>+ /**
>+ * The meta object literal for the 'Attr After' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute PERSISTENT_CONTAINMENT__ATTR_AFTER = eINSTANCE.getPersistentContainment_AttrAfter();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl Transient Container}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTransientContainer()
>+ * @generated
>+ */
>+ EClass TRANSIENT_CONTAINER = eINSTANCE.getTransientContainer();
>+
>+ /**
>+ * The meta object literal for the 'Attr Before' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute TRANSIENT_CONTAINER__ATTR_BEFORE = eINSTANCE.getTransientContainer_AttrBefore();
>+
>+ /**
>+ * The meta object literal for the 'Parent' container reference feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TRANSIENT_CONTAINER__PARENT = eINSTANCE.getTransientContainer_Parent();
>+
>+ /**
>+ * The meta object literal for the 'Attr After' attribute feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute TRANSIENT_CONTAINER__ATTR_AFTER = eINSTANCE.getTransientContainer_AttrAfter();
>+
>+ }
>+
>+} //Model2Package
>Index: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1206 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model2.impl;
>+
>+import org.eclipse.emf.cdo.tests.model1.VAT;
>+import org.eclipse.emf.cdo.tests.model2.Model2Package;
>+import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EcoreFactory;
>+import org.eclipse.emf.ecore.EcorePackage;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import java.util.Date;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Unsettable2 With Default'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#isUnsettableBoolean Unsettable Boolean}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableByte Unsettable Byte}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableChar Unsettable Char}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableDate Unsettable Date}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableDouble Unsettable Double}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableFloat Unsettable Float}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableInt Unsettable Int}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableLong Unsettable Long}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableShort Unsettable Short}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableString Unsettable String}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl#getUnsettableVAT Unsettable VAT}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettable2WithDefault
>+{
>+ /**
>+ * The default value of the '{@link #isUnsettableBoolean() Unsettable Boolean}' attribute.
>+ * 
>+ * 
>+ * @see #isUnsettableBoolean()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final boolean UNSETTABLE_BOOLEAN_EDEFAULT = true;
>+
>+ /**
>+ * The cached value of the '{@link #isUnsettableBoolean() Unsettable Boolean}' attribute.
>+ * 
>+ * 
>+ * @see #isUnsettableBoolean()
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Boolean attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableBooleanESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableByte() Unsettable Byte}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableByte()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final byte UNSETTABLE_BYTE_EDEFAULT = 0x03;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableByte() Unsettable Byte}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableByte()
>+ * @generated
>+ * @ordered
>+ */
>+ protected byte unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Byte attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableByteESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableChar() Unsettable Char}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableChar()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final char UNSETTABLE_CHAR_EDEFAULT = '\'';
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableChar() Unsettable Char}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableChar()
>+ * @generated
>+ * @ordered
>+ */
>+ protected char unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Char attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableCharESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableDate() Unsettable Date}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDate()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString(
>+ EcorePackage.eINSTANCE.getEDate(), "2009-12-21T15:12:59");
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableDate() Unsettable Date}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDate()
>+ * @generated
>+ * @ordered
>+ */
>+ protected Date unsettableDate = UNSETTABLE_DATE_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Date attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableDateESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableDouble() Unsettable Double}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDouble()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final double UNSETTABLE_DOUBLE_EDEFAULT = 3.3;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableDouble() Unsettable Double}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableDouble()
>+ * @generated
>+ * @ordered
>+ */
>+ protected double unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Double attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableDoubleESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableFloat() Unsettable Float}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableFloat()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final float UNSETTABLE_FLOAT_EDEFAULT = 4.4F;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableFloat() Unsettable Float}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableFloat()
>+ * @generated
>+ * @ordered
>+ */
>+ protected float unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Float attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableFloatESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableInt() Unsettable Int}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableInt()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final int UNSETTABLE_INT_EDEFAULT = 5;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableInt() Unsettable Int}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableInt()
>+ * @generated
>+ * @ordered
>+ */
>+ protected int unsettableInt = UNSETTABLE_INT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Int attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableIntESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableLong() Unsettable Long}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableLong()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final long UNSETTABLE_LONG_EDEFAULT = 6L;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableLong() Unsettable Long}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableLong()
>+ * @generated
>+ * @ordered
>+ */
>+ protected long unsettableLong = UNSETTABLE_LONG_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Long attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableLongESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableShort() Unsettable Short}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableShort()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final short UNSETTABLE_SHORT_EDEFAULT = 7;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableShort() Unsettable Short}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableShort()
>+ * @generated
>+ * @ordered
>+ */
>+ protected short unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable Short attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableShortESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableString() Unsettable String}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableString()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final String UNSETTABLE_STRING_EDEFAULT = "\"eike\"";
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableString() Unsettable String}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableString()
>+ * @generated
>+ * @ordered
>+ */
>+ protected String unsettableString = UNSETTABLE_STRING_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable String attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableStringESet;
>+
>+ /**
>+ * The default value of the '{@link #getUnsettableVAT() Unsettable VAT}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableVAT()
>+ * @generated
>+ * @ordered
>+ */
>+ protected static final VAT UNSETTABLE_VAT_EDEFAULT = VAT.VAT0;
>+
>+ /**
>+ * The cached value of the '{@link #getUnsettableVAT() Unsettable VAT}' attribute.
>+ * 
>+ * 
>+ * @see #getUnsettableVAT()
>+ * @generated
>+ * @ordered
>+ */
>+ protected VAT unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
>+
>+ /**
>+ * This is true if the Unsettable VAT attribute has been set.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ protected boolean unsettableVATESet;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected Unsettable2WithDefaultImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isUnsettableBoolean()
>+ {
>+ return unsettableBoolean;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableBoolean(boolean newUnsettableBoolean)
>+ {
>+ boolean oldUnsettableBoolean = unsettableBoolean;
>+ unsettableBoolean = newUnsettableBoolean;
>+ boolean oldUnsettableBooleanESet = unsettableBooleanESet;
>+ unsettableBooleanESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN,
>+ oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableBoolean()
>+ {
>+ boolean oldUnsettableBoolean = unsettableBoolean;
>+ boolean oldUnsettableBooleanESet = unsettableBooleanESet;
>+ unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT;
>+ unsettableBooleanESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET,
>+ Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean,
>+ UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableBoolean()
>+ {
>+ return unsettableBooleanESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public byte getUnsettableByte()
>+ {
>+ return unsettableByte;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableByte(byte newUnsettableByte)
>+ {
>+ byte oldUnsettableByte = unsettableByte;
>+ unsettableByte = newUnsettableByte;
>+ boolean oldUnsettableByteESet = unsettableByteESet;
>+ unsettableByteESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
>+ oldUnsettableByte, unsettableByte, !oldUnsettableByteESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableByte()
>+ {
>+ byte oldUnsettableByte = unsettableByte;
>+ boolean oldUnsettableByteESet = unsettableByteESet;
>+ unsettableByte = UNSETTABLE_BYTE_EDEFAULT;
>+ unsettableByteESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE,
>+ oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableByte()
>+ {
>+ return unsettableByteESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public char getUnsettableChar()
>+ {
>+ return unsettableChar;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableChar(char newUnsettableChar)
>+ {
>+ char oldUnsettableChar = unsettableChar;
>+ unsettableChar = newUnsettableChar;
>+ boolean oldUnsettableCharESet = unsettableCharESet;
>+ unsettableCharESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
>+ oldUnsettableChar, unsettableChar, !oldUnsettableCharESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableChar()
>+ {
>+ char oldUnsettableChar = unsettableChar;
>+ boolean oldUnsettableCharESet = unsettableCharESet;
>+ unsettableChar = UNSETTABLE_CHAR_EDEFAULT;
>+ unsettableCharESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR,
>+ oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableChar()
>+ {
>+ return unsettableCharESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Date getUnsettableDate()
>+ {
>+ return unsettableDate;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableDate(Date newUnsettableDate)
>+ {
>+ Date oldUnsettableDate = unsettableDate;
>+ unsettableDate = newUnsettableDate;
>+ boolean oldUnsettableDateESet = unsettableDateESet;
>+ unsettableDateESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
>+ oldUnsettableDate, unsettableDate, !oldUnsettableDateESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableDate()
>+ {
>+ Date oldUnsettableDate = unsettableDate;
>+ boolean oldUnsettableDateESet = unsettableDateESet;
>+ unsettableDate = UNSETTABLE_DATE_EDEFAULT;
>+ unsettableDateESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE,
>+ oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableDate()
>+ {
>+ return unsettableDateESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public double getUnsettableDouble()
>+ {
>+ return unsettableDouble;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableDouble(double newUnsettableDouble)
>+ {
>+ double oldUnsettableDouble = unsettableDouble;
>+ unsettableDouble = newUnsettableDouble;
>+ boolean oldUnsettableDoubleESet = unsettableDoubleESet;
>+ unsettableDoubleESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE,
>+ oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableDouble()
>+ {
>+ double oldUnsettableDouble = unsettableDouble;
>+ boolean oldUnsettableDoubleESet = unsettableDoubleESet;
>+ unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT;
>+ unsettableDoubleESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET,
>+ Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT,
>+ oldUnsettableDoubleESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableDouble()
>+ {
>+ return unsettableDoubleESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public float getUnsettableFloat()
>+ {
>+ return unsettableFloat;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableFloat(float newUnsettableFloat)
>+ {
>+ float oldUnsettableFloat = unsettableFloat;
>+ unsettableFloat = newUnsettableFloat;
>+ boolean oldUnsettableFloatESet = unsettableFloatESet;
>+ unsettableFloatESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
>+ oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableFloat()
>+ {
>+ float oldUnsettableFloat = unsettableFloat;
>+ boolean oldUnsettableFloatESet = unsettableFloatESet;
>+ unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT;
>+ unsettableFloatESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT,
>+ oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableFloat()
>+ {
>+ return unsettableFloatESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getUnsettableInt()
>+ {
>+ return unsettableInt;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableInt(int newUnsettableInt)
>+ {
>+ int oldUnsettableInt = unsettableInt;
>+ unsettableInt = newUnsettableInt;
>+ boolean oldUnsettableIntESet = unsettableIntESet;
>+ unsettableIntESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
>+ oldUnsettableInt, unsettableInt, !oldUnsettableIntESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableInt()
>+ {
>+ int oldUnsettableInt = unsettableInt;
>+ boolean oldUnsettableIntESet = unsettableIntESet;
>+ unsettableInt = UNSETTABLE_INT_EDEFAULT;
>+ unsettableIntESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT,
>+ oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableInt()
>+ {
>+ return unsettableIntESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public long getUnsettableLong()
>+ {
>+ return unsettableLong;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableLong(long newUnsettableLong)
>+ {
>+ long oldUnsettableLong = unsettableLong;
>+ unsettableLong = newUnsettableLong;
>+ boolean oldUnsettableLongESet = unsettableLongESet;
>+ unsettableLongESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
>+ oldUnsettableLong, unsettableLong, !oldUnsettableLongESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableLong()
>+ {
>+ long oldUnsettableLong = unsettableLong;
>+ boolean oldUnsettableLongESet = unsettableLongESet;
>+ unsettableLong = UNSETTABLE_LONG_EDEFAULT;
>+ unsettableLongESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG,
>+ oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableLong()
>+ {
>+ return unsettableLongESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public short getUnsettableShort()
>+ {
>+ return unsettableShort;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableShort(short newUnsettableShort)
>+ {
>+ short oldUnsettableShort = unsettableShort;
>+ unsettableShort = newUnsettableShort;
>+ boolean oldUnsettableShortESet = unsettableShortESet;
>+ unsettableShortESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
>+ oldUnsettableShort, unsettableShort, !oldUnsettableShortESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableShort()
>+ {
>+ short oldUnsettableShort = unsettableShort;
>+ boolean oldUnsettableShortESet = unsettableShortESet;
>+ unsettableShort = UNSETTABLE_SHORT_EDEFAULT;
>+ unsettableShortESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT,
>+ oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableShort()
>+ {
>+ return unsettableShortESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getUnsettableString()
>+ {
>+ return unsettableString;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableString(String newUnsettableString)
>+ {
>+ String oldUnsettableString = unsettableString;
>+ unsettableString = newUnsettableString;
>+ boolean oldUnsettableStringESet = unsettableStringESet;
>+ unsettableStringESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING,
>+ oldUnsettableString, unsettableString, !oldUnsettableStringESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableString()
>+ {
>+ String oldUnsettableString = unsettableString;
>+ boolean oldUnsettableStringESet = unsettableStringESet;
>+ unsettableString = UNSETTABLE_STRING_EDEFAULT;
>+ unsettableStringESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET,
>+ Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT,
>+ oldUnsettableStringESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableString()
>+ {
>+ return unsettableStringESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public VAT getUnsettableVAT()
>+ {
>+ return unsettableVAT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void setUnsettableVAT(VAT newUnsettableVAT)
>+ {
>+ VAT oldUnsettableVAT = unsettableVAT;
>+ unsettableVAT = newUnsettableVAT == null ? UNSETTABLE_VAT_EDEFAULT : newUnsettableVAT;
>+ boolean oldUnsettableVATESet = unsettableVATESet;
>+ unsettableVATESet = true;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
>+ oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void unsetUnsettableVAT()
>+ {
>+ VAT oldUnsettableVAT = unsettableVAT;
>+ boolean oldUnsettableVATESet = unsettableVATESet;
>+ unsettableVAT = UNSETTABLE_VAT_EDEFAULT;
>+ unsettableVATESet = false;
>+ if (eNotificationRequired())
>+ eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT,
>+ oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet));
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public boolean isSetUnsettableVAT()
>+ {
>+ return unsettableVATESet;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN:
>+ return isUnsettableBoolean();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE:
>+ return getUnsettableByte();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR:
>+ return getUnsettableChar();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE:
>+ return getUnsettableDate();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE:
>+ return getUnsettableDouble();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT:
>+ return getUnsettableFloat();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT:
>+ return getUnsettableInt();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG:
>+ return getUnsettableLong();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT:
>+ return getUnsettableShort();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING:
>+ return getUnsettableString();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT:
>+ return getUnsettableVAT();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN:
>+ setUnsettableBoolean((Boolean)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE:
>+ setUnsettableByte((Byte)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR:
>+ setUnsettableChar((Character)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE:
>+ setUnsettableDate((Date)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE:
>+ setUnsettableDouble((Double)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT:
>+ setUnsettableFloat((Float)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT:
>+ setUnsettableInt((Integer)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG:
>+ setUnsettableLong((Long)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT:
>+ setUnsettableShort((Short)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING:
>+ setUnsettableString((String)newValue);
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT:
>+ setUnsettableVAT((VAT)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN:
>+ unsetUnsettableBoolean();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE:
>+ unsetUnsettableByte();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR:
>+ unsetUnsettableChar();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE:
>+ unsetUnsettableDate();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE:
>+ unsetUnsettableDouble();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT:
>+ unsetUnsettableFloat();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT:
>+ unsetUnsettableInt();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG:
>+ unsetUnsettableLong();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT:
>+ unsetUnsettableShort();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING:
>+ unsetUnsettableString();
>+ return;
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT:
>+ unsetUnsettableVAT();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN:
>+ return isSetUnsettableBoolean();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE:
>+ return isSetUnsettableByte();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR:
>+ return isSetUnsettableChar();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE:
>+ return isSetUnsettableDate();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE:
>+ return isSetUnsettableDouble();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT:
>+ return isSetUnsettableFloat();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT:
>+ return isSetUnsettableInt();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG:
>+ return isSetUnsettableLong();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT:
>+ return isSetUnsettableShort();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING:
>+ return isSetUnsettableString();
>+ case Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT:
>+ return isSetUnsettableVAT();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (unsettableBoolean: ");
>+ if (unsettableBooleanESet)
>+ result.append(unsettableBoolean);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableByte: ");
>+ if (unsettableByteESet)
>+ result.append(unsettableByte);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableChar: ");
>+ if (unsettableCharESet)
>+ result.append(unsettableChar);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableDate: ");
>+ if (unsettableDateESet)
>+ result.append(unsettableDate);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableDouble: ");
>+ if (unsettableDoubleESet)
>+ result.append(unsettableDouble);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableFloat: ");
>+ if (unsettableFloatESet)
>+ result.append(unsettableFloat);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableInt: ");
>+ if (unsettableIntESet)
>+ result.append(unsettableInt);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableLong: ");
>+ if (unsettableLongESet)
>+ result.append(unsettableLong);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableShort: ");
>+ if (unsettableShortESet)
>+ result.append(unsettableShort);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableString: ");
>+ if (unsettableStringESet)
>+ result.append(unsettableString);
>+ else
>+ result.append("<unset>");
>+ result.append(", unsettableVAT: ");
>+ if (unsettableVATESet)
>+ result.append(unsettableVAT);
>+ else
>+ result.append("<unset>");
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //Unsettable2WithDefaultImpl
>#P org.eclipse.emf.cdo.tests.model3
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 SubpackageFactory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java	3 Jan 2010 09:57:59 -0000
>@@ -12,35 +12,35 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.subpackage;
> 
>-import org.eclipse.emf.ecore.EFactory;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
>+
> 
> /**
> *  The Factory for the model. It provides a create method for each non-abstract class of
> * the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage
> * @generated
> */
>-public interface SubpackageFactory extends EFactory
>+public interface SubpackageFactory extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory
> {
> /**
>- * The singleton instance of the factory.  
>- * 
>+ * The singleton instance of the factory.
>+ *  
> * @generated
> */
> SubpackageFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackageFactoryImpl.init();
> 
> /**
>- * Returns a new object of class 'Class2'.  
>- * 
>+ * Returns a new object of class 'Class2'.
>+ *  
> * @return a new object of class 'Class2'.
> * @generated
> */
> Class2 createClass2();
> 
> /**
>- * Returns the package supported by this factory.  
>- * 
>+ * Returns the package supported by this factory.
>+ *  
> * @return the package supported by this factory.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/Class2.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/Class2.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/Class2.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/Class2.java	22 Aug 2009 09:33:57 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,53 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: Class2.java,v 1.2 2009/08/22 09:33:57 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model3.subpackage;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Class2'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 Class1}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage#getClass2()
>- * @model
>- * @generated
>- */
>-public interface Class2 extends EObject
>-{
>- /**
>- * Returns the value of the 'Class1' reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model3.Class1}. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 Class2}'. 
>- * 
>- * If the meaning of the 'Class1' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Class1' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage#getClass2_Class1()
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2
>- * @model opposite="class2"
>- * @generated
>- */
>- EList<Class1> getClass1();
>-
>-} // Class2
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java,v
>retrieving revision 1.5
>diff -u -r1.5 SubpackagePackage.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java	3 Jan 2010 09:57:59 -0000
>@@ -13,7 +13,6 @@
> package org.eclipse.emf.cdo.tests.legacy.model3.subpackage;
> 
> import org.eclipse.emf.ecore.EClass;
>-import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EReference;
> 
> /**
>@@ -25,45 +24,43 @@
> * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory
> * @model kind="package"
> * @generated
> */
>-public interface SubpackagePackage extends EPackage
>+public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage
> {
> /**
>- * The package name.  
>- * 
>+ * The package name.
>+ *  
> * @generated
> */
> String eNAME = "subpackage";
> 
> /**
>- * The package namespace URI.  
>- * 
>- * @generated
>+ * The package namespace URI.
>+ *  
>+ * @generated NOT
> */
>- String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0";
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/subpackage/1.0.0";
> 
> /**
>- * The package namespace name.  
>- * 
>+ * The package namespace name.
>+ *  
> * @generated
> */
> String eNS_PREFIX = "subpackage";
> 
> /**
>- * The singleton instance of the package.  
>- * 
>+ * The singleton instance of the package.
>+ *  
> * @generated
> */
> SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl.init();
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
>- * Class2}' class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl Class2}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl#getClass2()
> * @generated
>@@ -71,25 +68,24 @@
> int CLASS2 = 0;
> 
> /**
>- * The feature id for the 'Class1' reference list.  
>- * 
>+ * The feature id for the 'Class1' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int CLASS2__CLASS1 = 0;
> 
> /**
>- * The number of structural features of the 'Class2' class.  
>- * 
>+ * The number of structural features of the 'Class2' class.
>+ *  
> * @generated
> * @ordered
> */
> int CLASS2_FEATURE_COUNT = 1;
> 
> /**
>- * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
>- * Class2}'.  
>- * 
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 Class2}'.
>+ *  
> * @return the meta object for class 'Class2'.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
> * @generated
>@@ -97,10 +93,9 @@
> EClass getClass2();
> 
> /**
>- * Returns the meta object for the reference list '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 Class1}'.  
>- * 
> * @return the meta object for the reference list 'Class1'.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1()
> * @see #getClass2()
>@@ -109,8 +104,8 @@
> EReference getClass2_Class1();
> 
> /**
>- * Returns the factory that creates the instances of the model.  
>- * 
>+ * Returns the factory that creates the instances of the model.
>+ *  
> * @return the factory that creates the instances of the model.
> * @generated
> */
>@@ -125,15 +120,13 @@
> * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @generated
> */
> interface Literals
> {
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
>- * Class2}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl Class2}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl#getClass2()
> * @generated
>@@ -141,9 +134,9 @@
> EClass CLASS2 = eINSTANCE.getClass2();
> 
> /**
>- * The meta object literal for the 'Class1' reference list feature.   
>- * 
> * @generated
> */
> EReference CLASS2__CLASS1 = eINSTANCE.getClass2_Class1();
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/Class1.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model3/Class1.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model3/Class1.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/Class1.java	22 Aug 2009 09:33:56 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,77 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: Class1.java,v 1.2 2009/08/22 09:33:56 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model3;
>-
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'Class1'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 Class2}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package#getClass1()
>- * @model
>- * @generated
>- */
>-public interface Class1 extends EObject
>-{
>- /**
>- * Returns the value of the 'Class2' reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2}. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 Class1}'. 
>- * 
>- * If the meaning of the 'Class2' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Class2' reference list.
>- * @see #isSetClass2()
>- * @see #unsetClass2()
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package#getClass1_Class2()
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1
>- * @model opposite="class1" unsettable="true"
>- * @generated
>- */
>- EList<Class2> getClass2();
>-
>- /**
>- * Unsets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 Class2}'
>- * reference list.  
>- * 
>- * @see #isSetClass2()
>- * @see #getClass2()
>- * @generated
>- */
>- void unsetClass2();
>-
>- /**
>- * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 Class2}'
>- * reference list is set.  
>- * 
>- * @return whether the value of the 'Class2' reference list is set.
>- * @see #unsetClass2()
>- * @see #getClass2()
>- * @generated
>- */
>- boolean isSetClass2();
>-
>-} // Class1
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/MetaRef.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model3/MetaRef.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model3/MetaRef.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/MetaRef.java	22 Aug 2009 09:33:56 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: MetaRef.java,v 1.2 2009/08/22 09:33:56 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model3;
>-
>-import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.emf.ecore.EPackage;
>-
>-/**
>- *  A representation of the model object 'Meta Ref'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef EPackage Ref}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package#getMetaRef()
>- * @model
>- * @generated
>- */
>-public interface MetaRef extends EObject
>-{
>- /**
>- * Returns the value of the 'EPackage Ref' reference. 
>- * 
>- * If the meaning of the 'EPackage Ref' reference isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'EPackage Ref' reference.
>- * @see #setEPackageRef(EPackage)
>- * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package#getMetaRef_EPackageRef()
>- * @model
>- * @generated
>- */
>- EPackage getEPackageRef();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef EPackage Ref}
>- * ' reference.  
>- * 
>- * @param value
>- * the new value of the 'EPackage Ref' reference.
>- * @see #getEPackageRef()
>- * @generated
>- */
>- void setEPackageRef(EPackage value);
>-
>-} // MetaRef
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java,v
>retrieving revision 1.5
>diff -u -r1.5 Model3Factory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java	22 Aug 2009 09:33:56 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java	3 Jan 2010 09:57:58 -0000
>@@ -12,43 +12,43 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3;
> 
>-import org.eclipse.emf.ecore.EFactory;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.MetaRef;
> 
> /**
> *  The Factory for the model. It provides a create method for each non-abstract class of
> * the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package
> * @generated
> */
>-public interface Model3Factory extends EFactory
>+public interface Model3Factory extends org.eclipse.emf.cdo.tests.model3.Model3Factory
> {
> /**
>- * The singleton instance of the factory.  
>- * 
>+ * The singleton instance of the factory.
>+ *  
> * @generated
> */
> Model3Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3FactoryImpl.init();
> 
> /**
>- * Returns a new object of class 'Class1'.  
>- * 
>+ * Returns a new object of class 'Class1'.
>+ *  
> * @return a new object of class 'Class1'.
> * @generated
> */
> Class1 createClass1();
> 
> /**
>- * Returns a new object of class 'Meta Ref'.  
>- * 
>+ * Returns a new object of class 'Meta Ref'.
>+ *  
> * @return a new object of class 'Meta Ref'.
> * @generated
> */
> MetaRef createMetaRef();
> 
> /**
>- * Returns the package supported by this factory.  
>- * 
>+ * Returns the package supported by this factory.
>+ *  
> * @return the package supported by this factory.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java,v
>retrieving revision 1.5
>diff -u -r1.5 Model3Package.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java	22 Aug 2009 09:33:56 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java	3 Jan 2010 09:57:58 -0000
>@@ -13,7 +13,6 @@
> package org.eclipse.emf.cdo.tests.legacy.model3;
> 
> import org.eclipse.emf.ecore.EClass;
>-import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.EReference;
> 
> /**
>@@ -25,37 +24,36 @@
> * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory
> * @model kind="package"
> * @generated
> */
>-public interface Model3Package extends EPackage
>+public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Package
> {
> /**
>- * The package name.  
>- * 
>+ * The package name.
>+ *  
> * @generated
> */
> String eNAME = "model3";
> 
> /**
>- * The package namespace URI.  
>- * 
>- * @generated
>+ * The package namespace URI.
>+ *  
>+ * @generated NOT
> */
>- String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model3/1.0.0";
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0";
> 
> /**
>- * The package namespace name.  
>- * 
>+ * The package namespace name.
>+ *  
> * @generated
> */
> String eNS_PREFIX = "model3";
> 
> /**
>- * The singleton instance of the package.  
>- * 
>+ * The singleton instance of the package.
>+ *  
> * @generated
> */
> Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl.init();
>@@ -63,7 +61,6 @@
> /**
> * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl Class1}' class.
> *  
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClass1()
> * @generated
>@@ -71,25 +68,24 @@
> int CLASS1 = 0;
> 
> /**
>- * The feature id for the 'Class2' reference list.  
>- * 
>+ * The feature id for the 'Class2' reference list.
>+ *  
> * @generated
> * @ordered
> */
> int CLASS1__CLASS2 = 0;
> 
> /**
>- * The number of structural features of the 'Class1' class.  
>- * 
>+ * The number of structural features of the 'Class1' class.
>+ *  
> * @generated
> * @ordered
> */
> int CLASS1_FEATURE_COUNT = 1;
> 
> /**
>- * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl Meta Ref}'
>- * class.  
>- * 
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl Meta Ref}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getMetaRef()
> * @generated
>@@ -97,16 +93,16 @@
> int META_REF = 1;
> 
> /**
>- * The feature id for the 'EPackage Ref' reference.  
>- * 
>+ * The feature id for the 'EPackage Ref' reference.
>+ *  
> * @generated
> * @ordered
> */
> int META_REF__EPACKAGE_REF = 0;
> 
> /**
>- * The number of structural features of the 'Meta Ref' class.  
>- * 
>+ * The number of structural features of the 'Meta Ref' class.
>+ *  
> * @generated
> * @ordered
> */
>@@ -123,9 +119,8 @@
> EClass getClass1();
> 
> /**
>- * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2
>- * Class2}'.  
>- * 
>+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 Class2}'.
>+ *  
> * @return the meta object for the reference list 'Class2'.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2()
> * @see #getClass1()
>@@ -144,9 +139,8 @@
> EClass getMetaRef();
> 
> /**
>- * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef
>- * EPackage Ref}'.  
>- * 
>+ * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef EPackage Ref}'.
>+ *  
> * @return the meta object for the reference 'EPackage Ref'.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef()
> * @see #getMetaRef()
>@@ -155,8 +149,8 @@
> EReference getMetaRef_EPackageRef();
> 
> /**
>- * Returns the factory that creates the instances of the model.  
>- * 
>+ * Returns the factory that creates the instances of the model.
>+ *  
> * @return the factory that creates the instances of the model.
> * @generated
> */
>@@ -171,15 +165,13 @@
> * <li>and each data type</li>
> * </ul>
> * 
>- * 
> * @generated
> */
> interface Literals
> {
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl Class1}'
>- * class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl Class1}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClass1()
> * @generated
>@@ -187,17 +179,16 @@
> EClass CLASS1 = eINSTANCE.getClass1();
> 
> /**
>- * The meta object literal for the 'Class2' reference list feature.   
>- * 
> * @generated
> */
> EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2();
> 
> /**
>- * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl
>- * Meta Ref}' class.  
>- * 
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl Meta Ref}' class.
>+ *  
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl
> * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getMetaRef()
> * @generated
>@@ -205,9 +196,9 @@
> EClass META_REF = eINSTANCE.getMetaRef();
> 
> /**
>- * The meta object literal for the 'EPackage Ref' reference feature.   
>- * 
> * @generated
> */
> EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef();
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java,v
>retrieving revision 1.5
>diff -u -r1.5 Class2Impl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java	3 Jan 2010 09:57:59 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl#getClass1 Class1}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl#getClass1 Class1}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class Class2Impl extends EObjectImpl implements Class2
> {
> /**
>- * The cached value of the '{@link #getClass1() Class1}' reference list.   
>- * 
> * @see #getClass1()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected Class2Impl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<Class1> getClass1()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -105,7 +101,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -121,7 +116,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -137,7 +131,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -156,7 +149,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -173,7 +165,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 SubpackagePackageImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java	3 Jan 2010 09:57:59 -0000
>@@ -14,9 +14,9 @@
> 
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
> import org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl;
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EPackage;
>@@ -26,14 +26,12 @@
> 
> /**
> *  An implementation of the model Package. 
>- * 
> * @generated
> */
> public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePackage
> {
> /**
> *  
>- * 
> * @generated
> */
> private EClass class2EClass = null;
>@@ -58,18 +56,17 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> private static boolean isInited = false;
> 
> /**
> * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>- * 
>- * This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed. Clients should
>- * not invoke it directly. Instead, they should simply access that field to obtain the package.  
> * 
>+ * This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ *  
> * @see #eNS_URI
> * @see #createPackageContents()
> * @see #initializePackageContents()
>@@ -113,7 +110,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getClass2()
>@@ -123,7 +119,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getClass2_Class1()
>@@ -133,7 +128,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SubpackageFactory getSubpackageFactory()
>@@ -143,15 +137,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void createPackageContents()
>@@ -167,15 +160,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void initializePackageContents()
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 SubpackageFactoryImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java	3 Jan 2010 09:57:59 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>@@ -24,22 +24,21 @@
> 
> /**
> *  An implementation of the model Factory. 
>- * 
> * @generated
> */
> public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFactory
> {
> /**
>- * Creates the default factory implementation.  
>- * 
>- * @generated
>+ * Creates the default factory implementation.
>+ *  
>+ * @generated NOT
> */
> public static SubpackageFactory init()
> {
> try
> {
> SubpackageFactory theSubpackageFactory = (SubpackageFactory)EPackage.Registry.INSTANCE
>- .getEFactory("http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0");
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/subpackage/1.0.0");
> if (theSubpackageFactory != null)
> {
> return theSubpackageFactory;
>@@ -53,8 +52,8 @@
> }
> 
> /**
>- * Creates an instance of the factory.  
>- * 
>+ * Creates an instance of the factory.
>+ *  
> * @generated
> */
> public SubpackageFactoryImpl()
>@@ -64,7 +63,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -81,7 +79,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public Class2 createClass2()
>@@ -92,7 +89,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public SubpackagePackage getSubpackagePackage()
>@@ -102,7 +98,6 @@
> 
> /**
> *  
>- * 
> * @deprecated
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java,v
>retrieving revision 1.5
>diff -u -r1.5 SubpackageSwitch.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java	3 Jan 2010 09:57:59 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>@@ -25,22 +25,21 @@
> * {@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. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage
> * @generated
> */
> public class SubpackageSwitch<T>
> {
> /**
>- * The cached model package  
>- * 
>+ * The cached model package
>+ *  
> * @generated
> */
> protected static SubpackagePackage modelPackage;
> 
> /**
>- * Creates an instance of the switch.  
>- * 
>+ * Creates an instance of the switch.
>+ *  
> * @generated
> */
> public SubpackageSwitch()
>@@ -54,7 +53,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -66,7 +64,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -86,7 +83,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -108,11 +104,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'Class2'.  This
>+ * Returns the result of interpreting the object as an instance of 'Class2'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'Class2'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -123,12 +118,11 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'EObject'.  This
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
> * anyway. 
>- * 
>- * @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 'EObject'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 SubpackageAdapterFactory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java	3 Jan 2010 09:57:59 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
> 
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notifier;
>@@ -23,22 +23,21 @@
> /**
> *  The Adapter Factory for the model. It provides an adapter <code>createXXX</code>
> * method for each class of the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage
> * @generated
> */
> public class SubpackageAdapterFactory extends AdapterFactoryImpl
> {
> /**
>- * The cached model package.  
>- * 
>+ * The cached model package.
>+ *  
> * @generated
> */
> protected static SubpackagePackage modelPackage;
> 
> /**
>- * Creates an instance of the adapter factory.  
>- * 
>+ * Creates an instance of the adapter factory.
>+ *  
> * @generated
> */
> public SubpackageAdapterFactory()
>@@ -50,10 +49,10 @@
> }
> 
> /**
>- * Returns whether this factory is applicable for the type of the object.  This implementation
>+ * Returns whether this factory is applicable for the type of the object.
>+ *  This implementation
> * returns <code>true</code> if the object is either the model's package or is an instance object of the model. 
>- * 
> * @return whether this factory is applicable for the type of the object.
> * @generated
> */
>@@ -72,8 +71,8 @@
> }
> 
> /**
>- * The switch that delegates to the <code>createXXX</code> methods.  
>- * 
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ *  
> * @generated
> */
> protected SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>()
>@@ -92,10 +91,9 @@
> };
> 
> /**
>- * Creates an adapter for the <code>target</code>.  
>- * 
>- * @param target
>- * the object to adapt.
>+ * Creates an adapter for the <code>target</code>.
>+ *  
>+ * @param target the object to adapt.
> * @return the adapter for the <code>target</code>.
> * @generated
> */
>@@ -106,10 +104,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
>- * Class2}'.  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.legacy.model3.subpackage.Class2 Class2}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2
> * @generated
>@@ -120,9 +117,9 @@
> }
> 
> /**
>- * Creates a new adapter for the default case.  This default implementation returns null.  This default implementation returns null. 
>- * 
> * @return the new adapter.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java,v
>retrieving revision 1.5
>diff -u -r1.5 Model3Switch.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java	3 Jan 2010 09:57:59 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.util;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
>-import org.eclipse.emf.cdo.tests.legacy.model3.MetaRef;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.MetaRef;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>@@ -26,22 +26,21 @@
> * {@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. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package
> * @generated
> */
> public class Model3Switch<T>
> {
> /**
>- * The cached model package  
>- * 
>+ * The cached model package
>+ *  
> * @generated
> */
> protected static Model3Package modelPackage;
> 
> /**
>- * Creates an instance of the switch.  
>- * 
>+ * Creates an instance of the switch.
>+ *  
> * @generated
> */
> public Model3Switch()
>@@ -55,7 +54,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -67,7 +65,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -87,7 +84,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -117,11 +113,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'Class1'.  This
>+ * Returns the result of interpreting the object as an instance of 'Class1'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'Class1'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -132,11 +127,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'Meta Ref'.  This
>+ * Returns the result of interpreting the object as an instance of 'Meta Ref'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'Meta Ref'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -147,12 +141,11 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'EObject'.  This
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
> * anyway. 
>- * 
>- * @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 'EObject'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 Model3AdapterFactory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java	3 Jan 2010 09:57:59 -0000
>@@ -12,9 +12,9 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.util;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
>-import org.eclipse.emf.cdo.tests.legacy.model3.MetaRef;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.MetaRef;
> 
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notifier;
>@@ -24,22 +24,21 @@
> /**
> *  The Adapter Factory for the model. It provides an adapter <code>createXXX</code>
> * method for each class of the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package
> * @generated
> */
> public class Model3AdapterFactory extends AdapterFactoryImpl
> {
> /**
>- * The cached model package.  
>- * 
>+ * The cached model package.
>+ *  
> * @generated
> */
> protected static Model3Package modelPackage;
> 
> /**
>- * Creates an instance of the adapter factory.  
>- * 
>+ * Creates an instance of the adapter factory.
>+ *  
> * @generated
> */
> public Model3AdapterFactory()
>@@ -51,10 +50,10 @@
> }
> 
> /**
>- * Returns whether this factory is applicable for the type of the object.  This implementation
>+ * Returns whether this factory is applicable for the type of the object.
>+ *  This implementation
> * returns <code>true</code> if the object is either the model's package or is an instance object of the model. 
>- * 
> * @return whether this factory is applicable for the type of the object.
> * @generated
> */
>@@ -73,8 +72,8 @@
> }
> 
> /**
>- * The switch that delegates to the <code>createXXX</code> methods.  
>- * 
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ *  
> * @generated
> */
> protected Model3Switch<Adapter> modelSwitch = new Model3Switch<Adapter>()
>@@ -99,10 +98,9 @@
> };
> 
> /**
>- * Creates an adapter for the <code>target</code>.  
>- * 
>- * @param target
>- * the object to adapt.
>+ * Creates an adapter for the <code>target</code>.
>+ *  
>+ * @param target the object to adapt.
> * @return the adapter for the <code>target</code>.
> * @generated
> */
>@@ -113,10 +111,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1
>- * Class1}'.  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.legacy.model3.Class1 Class1}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1
> * @generated
>@@ -127,10 +124,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef
>- * Meta Ref}'.  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.legacy.model3.MetaRef Meta Ref}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef
> * @generated
>@@ -141,9 +137,9 @@
> }
> 
> /**
>- * Creates a new adapter for the default case.  This default implementation returns null.  This default implementation returns null. 
>- * 
> * @return the new adapter.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 MetaRefImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java	3 Jan 2010 09:57:58 -0000
>@@ -12,8 +12,8 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.MetaRef;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
>+import org.eclipse.emf.cdo.tests.model3.MetaRef;
> 
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EClass;
>@@ -27,18 +27,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEPackageRef EPackage Ref}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEPackageRef EPackage Ref}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class MetaRefImpl extends EObjectImpl implements MetaRef
> {
> /**
>- * The cached value of the '{@link #getEPackageRef() EPackage Ref}' reference.   
>- * 
> * @see #getEPackageRef()
> * @generated
> * @ordered
>@@ -47,7 +47,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected MetaRefImpl()
>@@ -57,7 +56,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -68,7 +66,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EPackage getEPackageRef()
>@@ -89,7 +86,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EPackage basicGetEPackageRef()
>@@ -99,7 +95,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void setEPackageRef(EPackage newEPackageRef)
>@@ -113,7 +108,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -131,7 +125,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -148,7 +141,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -165,7 +157,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 Model3FactoryImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java	3 Jan 2010 09:57:58 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
>-import org.eclipse.emf.cdo.tests.legacy.model3.MetaRef;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.MetaRef;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>@@ -25,22 +25,21 @@
> 
> /**
> *  An implementation of the model Factory. 
>- * 
> * @generated
> */
> public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
> {
> /**
>- * Creates the default factory implementation.  
>- * 
>- * @generated
>+ * Creates the default factory implementation.
>+ *  
>+ * @generated NOT
> */
> public static Model3Factory init()
> {
> try
> {
> Model3Factory theModel3Factory = (Model3Factory)EPackage.Registry.INSTANCE
>- .getEFactory("http://www.eclipse.org/emf/CDO/tests/model3/1.0.0");
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0");
> if (theModel3Factory != null)
> {
> return theModel3Factory;
>@@ -54,8 +53,8 @@
> }
> 
> /**
>- * Creates an instance of the factory.  
>- * 
>+ * Creates an instance of the factory.
>+ *  
> * @generated
> */
> public Model3FactoryImpl()
>@@ -65,7 +64,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -84,7 +82,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public Class1 createClass1()
>@@ -95,7 +92,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public MetaRef createMetaRef()
>@@ -106,7 +102,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public Model3Package getModel3Package()
>@@ -116,7 +111,6 @@
> 
> /**
> *  
>- * 
> * @deprecated
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 Model3PackageImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java	3 Jan 2010 09:57:58 -0000
>@@ -12,12 +12,12 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
>-import org.eclipse.emf.cdo.tests.legacy.model3.MetaRef;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.MetaRef;
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EPackage;
>@@ -27,21 +27,18 @@
> 
> /**
> *  An implementation of the model Package. 
>- * 
> * @generated
> */
> public class Model3PackageImpl extends EPackageImpl implements Model3Package
> {
> /**
> *  
>- * 
> * @generated
> */
> private EClass class1EClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass metaRefEClass = null;
>@@ -66,18 +63,17 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> private static boolean isInited = false;
> 
> /**
> * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>- * 
>- * This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed. Clients should not
>- * invoke it directly. Instead, they should simply access that field to obtain the package. 
>- * 
> * 
>+ * This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
> * @see #eNS_URI
> * @see #createPackageContents()
> * @see #initializePackageContents()
>@@ -121,7 +117,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getClass1()
>@@ -131,7 +126,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getClass1_Class2()
>@@ -141,7 +135,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getMetaRef()
>@@ -151,7 +144,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getMetaRef_EPackageRef()
>@@ -161,7 +153,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public Model3Factory getModel3Factory()
>@@ -171,15 +162,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void createPackageContents()
>@@ -198,15 +188,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void initializePackageContents()
>Index: src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java,v
>retrieving revision 1.5
>diff -u -r1.5 Class1Impl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java	22 Aug 2009 09:33:57 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java	3 Jan 2010 09:57:58 -0000
>@@ -12,10 +12,10 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model3.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model3.Class1;
> import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
>-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2;
> import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
>+import org.eclipse.emf.cdo.tests.model3.Class1;
>+import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
> 
> import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
>@@ -32,18 +32,18 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl#getClass2 Class2}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl#getClass2 Class2}</li>
> * </ul>
> * 
>- * 
>+ *
> * @generated
> */
> public class Class1Impl extends EObjectImpl implements Class1
> {
> /**
>- * The cached value of the '{@link #getClass2() Class2}' reference list.   
>- * 
> * @see #getClass2()
> * @generated
> * @ordered
>@@ -52,7 +52,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> protected Class1Impl()
>@@ -62,7 +61,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -73,7 +71,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EList<Class2> getClass2()
>@@ -88,7 +85,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public void unsetClass2()
>@@ -99,7 +95,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public boolean isSetClass2()
>@@ -109,7 +104,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -126,7 +120,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -142,7 +135,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -158,7 +150,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @SuppressWarnings("unchecked")
>@@ -177,7 +168,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -194,7 +184,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF,v
>retrieving revision 1.10
>diff -u -r1.10 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Jun 2009 07:24:30 -0000	1.10
>+++ META-INF/MANIFEST.MF	3 Jan 2010 09:57:58 -0000
>@@ -10,7 +10,9 @@
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
> org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
> org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
>-Export-Package: org.eclipse.emf.cdo.tests.model3;version="3.0.0",
>+Export-Package: org.eclipse.emf.cdo.tests.legacy.model3,
>+ org.eclipse.emf.cdo.tests.legacy.model3.subpackage,
>+ org.eclipse.emf.cdo.tests.model3;version="3.0.0",
> org.eclipse.emf.cdo.tests.model3.impl;version="3.0.0",
> org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.0",
> org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.0",
>#P org.eclipse.emf.cdo.tests.model4interfaces
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainedElement.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,63 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IMultiRefNonContainedElement.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IMulti Ref Non Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IMultiRefNonContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Parent' reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements Elements}'.
>- * 
>- * 
>- * If the meaning of the 'Parent' reference isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' reference.
>- * @see #setParent(IMultiRefNonContainer)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements
>- * @model opposite="elements"
>- * @generated
>- */
>- IMultiRefNonContainer getParent();
>-
>- /**
>- * Sets the value of the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent Parent}'
>- * reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(IMultiRefNonContainer value);
>-
>-} // IMultiRefNonContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainer.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,53 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IMultiRefContainer.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IMulti Ref Container'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainer()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IMultiRefContainer extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' containment reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement}. It is bidirectional and its
>- * opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent
>- * Parent}'. 
>- * 
>- * If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' containment reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainer_Elements()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent
>- * @model opposite="parent" containment="true"
>- * @generated
>- */
>- EList<IMultiRefContainedElement> getElements();
>-
>-} // IMultiRefContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainerNPL.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IMultiRefNonContainerNPL.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IMulti Ref Non Container NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IMultiRefNonContainerNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink}. 
>- * 
>- * If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainerNPL_Elements()
>- * @model
>- * @generated
>- */
>- EList<IContainedElementNoParentLink> getElements();
>-
>-} // IMultiRefNonContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainer.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,63 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ISingleRefNonContainer.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'ISingle Ref Non Container'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainer()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface ISingleRefNonContainer extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent Parent}'.
>- * 
>- * 
>- * If the meaning of the 'Element' reference isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' reference.
>- * @see #setElement(ISingleRefNonContainedElement)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainer_Element()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent
>- * @model opposite="parent"
>- * @generated
>- */
>- ISingleRefNonContainedElement getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement
>- * Element}' reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(ISingleRefNonContainedElement value);
>-
>-} // ISingleRefNonContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainedElement.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,64 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IMultiRefContainedElement.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IMulti Ref Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IMultiRefContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Parent' container reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements Elements}'. 
>- * 
>- * If the meaning of the 'Parent' container reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' container reference.
>- * @see #setParent(IMultiRefContainer)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer#getElements
>- * @model opposite="elements" transient="false"
>- * @generated
>- */
>- IMultiRefContainer getParent();
>-
>- /**
>- * Sets the value of the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement#getParent Parent}'
>- * container reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' container reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(IMultiRefContainer value);
>-
>-} // IMultiRefContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainerNPL.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,61 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ISingleRefNonContainerNPL.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'ISingle Ref Non Container NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface ISingleRefNonContainerNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' reference. 
>- * 
>- * If the meaning of the 'Element' reference isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' reference.
>- * @see #setElement(IContainedElementNoParentLink)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainerNPL_Element()
>- * @model
>- * @generated
>- */
>- IContainedElementNoParentLink getElement();
>-
>- /**
>- * Sets the value of the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL#getElement Element}'
>- * reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(IContainedElementNoParentLink value);
>-
>-} // ISingleRefNonContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainer.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,63 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ISingleRefContainer.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'ISingle Ref Container'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainer()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface ISingleRefContainer extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' containment reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent Parent}'.
>- * 
>- * 
>- * If the meaning of the 'Element' containment reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' containment reference.
>- * @see #setElement(ISingleRefContainedElement)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainer_Element()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent
>- * @model opposite="parent" containment="true"
>- * @generated
>- */
>- ISingleRefContainedElement getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement
>- * Element}' containment reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' containment reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(ISingleRefContainedElement value);
>-
>-} // ISingleRefContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefNonContainer.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,53 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IMultiRefNonContainer.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IMulti Ref Non Container'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IMultiRefNonContainer extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement}. It is bidirectional and its
>- * opposite is '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent
>- * Parent}'. 
>- * 
>- * If the meaning of the 'Elements' reference list isn't clear, there really should be more of a description
>- * here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefNonContainer_Elements()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement#getParent
>- * @model opposite="parent"
>- * @generated
>- */
>- EList<IMultiRefNonContainedElement> getElements();
>-
>-} // IMultiRefNonContainer
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IContainedElementNoParentLink.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,27 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IContainedElementNoParentLink.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IContained Element No Parent Link'.
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIContainedElementNoParentLink()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IContainedElementNoParentLink extends EObject
>-{
>-} // IContainedElementNoParentLink
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java,v
>retrieving revision 1.5
>diff -u -r1.5 model4interfacesPackage.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java	11 Jan 2009 08:53:34 -0000	1.5
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java	3 Jan 2010 09:58:02 -0000
>@@ -26,7 +26,7 @@
> * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesFactory
> * @model kind="package"
>- * @generated NOT
>+ * @generated
> */
> public interface model4interfacesPackage extends org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage
> {
>@@ -40,9 +40,9 @@
> /**
> * The package namespace URI.  
> * 
>- * @generated
>+ * @generated NOT
> */
>- String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model4interfaces/1.0.0";
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model4interfaces/1.0.0";
> 
> /**
> * The package namespace name.  
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefNonContainedElement.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,64 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ISingleRefNonContainedElement.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'ISingle Ref Non Contained Element'.
>- * 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent Parent}
>- * </li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface ISingleRefNonContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Parent' reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement Element}'. 
>- * 
>- * If the meaning of the 'Parent' reference isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' reference.
>- * @see #setParent(ISingleRefNonContainer)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefNonContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer#getElement
>- * @model opposite="element"
>- * @generated
>- */
>- ISingleRefNonContainer getParent();
>-
>- /**
>- * Sets the value of the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement#getParent Parent}'
>- * reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(ISingleRefNonContainer value);
>-
>-} // ISingleRefNonContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainerNPL.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,60 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ISingleRefContainerNPL.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'ISingle Ref Container NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL#getElement Element}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface ISingleRefContainerNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Element' containment reference. 
>- * 
>- * If the meaning of the 'Element' containment reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Element' containment reference.
>- * @see #setElement(IContainedElementNoParentLink)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainerNPL_Element()
>- * @model containment="true"
>- * @generated
>- */
>- IContainedElementNoParentLink getElement();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL#getElement
>- * Element}' containment reference.  
>- * 
>- * @param value
>- * the new value of the 'Element' containment reference.
>- * @see #getElement()
>- * @generated
>- */
>- void setElement(IContainedElementNoParentLink value);
>-
>-} // ISingleRefContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/ISingleRefContainedElement.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,64 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: ISingleRefContainedElement.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'ISingle Ref Contained Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent Parent}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainedElement()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface ISingleRefContainedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Parent' container reference. It is bidirectional and its opposite is '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement Element}'. 
>- * 
>- * If the meaning of the 'Parent' container reference isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Parent' container reference.
>- * @see #setParent(ISingleRefContainer)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getISingleRefContainedElement_Parent()
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer#getElement
>- * @model opposite="element" transient="false"
>- * @generated
>- */
>- ISingleRefContainer getParent();
>-
>- /**
>- * Sets the value of the '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement#getParent Parent}'
>- * container reference.  
>- * 
>- * @param value
>- * the new value of the 'Parent' container reference.
>- * @see #getParent()
>- * @generated
>- */
>- void setParent(ISingleRefContainer value);
>-
>-} // ISingleRefContainedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/IMultiRefContainerNPL.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,50 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: IMultiRefContainerNPL.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'IMulti Ref Container NPL'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL#getElements Elements}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface IMultiRefContainerNPL extends EObject
>-{
>- /**
>- * Returns the value of the 'Elements' containment reference list. The list contents are of type
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink}. 
>- * 
>- * If the meaning of the 'Elements' containment reference list isn't clear, there really should be more of a
>- * description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Elements' containment reference list.
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getIMultiRefContainerNPL_Elements()
>- * @model containment="true"
>- * @generated
>- */
>- EList<IContainedElementNoParentLink> getElements();
>-
>-} // IMultiRefContainerNPL
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/INamedElement.java	22 Aug 2009 09:34:16 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,58 +0,0 @@
>-/**
>- * Copyright (c) 2004 - 2009 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
>- *
>- * $Id: INamedElement.java,v 1.2 2009/08/22 09:34:16 estepper Exp $
>- */
>-package org.eclipse.emf.cdo.tests.legacy.model4interfaces;
>-
>-import org.eclipse.emf.ecore.EObject;
>-
>-/**
>- *  A representation of the model object 'INamed Element'. 
>- * 
>- * The following features are supported:
>- * <ul>
>- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement#getName Name}</li>
>- * </ul>
>- * 
>- * 
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getINamedElement()
>- * @model interface="true" abstract="true"
>- * @generated
>- */
>-public interface INamedElement extends EObject
>-{
>- /**
>- * Returns the value of the 'Name' attribute. 
>- * 
>- * If the meaning of the 'Name' attribute isn't clear, there really should be more of a description here...
>- * 
>- * 
>- * 
>- * @return the value of the 'Name' attribute.
>- * @see #setName(String)
>- * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage#getINamedElement_Name()
>- * @model
>- * @generated
>- */
>- String getName();
>-
>- /**
>- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement#getName
>- * Name}' attribute.  
>- * 
>- * @param value
>- * the new value of the 'Name' attribute.
>- * @see #getName()
>- * @generated
>- */
>- void setName(String value);
>-
>-} // INamedElement
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java,v
>retrieving revision 1.7
>diff -u -r1.7 model4interfacesSwitch.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java	22 Aug 2009 09:34:16 -0000	1.7
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java	3 Jan 2010 09:58:02 -0000
>@@ -30,28 +30,28 @@
> import org.eclipse.emf.ecore.EObject;
> 
> import java.util.List;
>+import org.eclipse.emf.cdo.tests.legacy.model4interfaces.*;
> 
> /**
> *  The Switch 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. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage
> * @generated
> */
> public class model4interfacesSwitch<T>
> {
> /**
>- * The cached model package  
>- * 
>+ * The cached model package
>+ *  
> * @generated
> */
> protected static model4interfacesPackage modelPackage;
> 
> /**
>- * Creates an instance of the switch.  
>- * 
>+ * Creates an instance of the switch.
>+ *  
> * @generated
> */
> public model4interfacesSwitch()
>@@ -65,7 +65,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -77,7 +76,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -97,7 +95,6 @@
> /**
> * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
> *  
>- * 
> * @return the first non-null result returned by a <code>caseXXX</code> call.
> * @generated
> */
>@@ -351,11 +348,10 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'INamed Element'. 
>+ * Returns the result of interpreting the object as an instance of 'INamed Element'.
>+ * 
> * This implementation returns null; returning a non-null result will terminate the switch. 
>- * 
>- * @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 'INamed Element'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> * @generated
>@@ -446,12 +442,11 @@
> }
> 
> /**
>- * Returns the result of interpreting the object as an instance of 'EObject'.  This
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ *  This
> * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
> * anyway. 
>- * 
>- * @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 'EObject'.
> * @see #doSwitch(org.eclipse.emf.ecore.EObject)
> * @generated
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java,v
>retrieving revision 1.7
>diff -u -r1.7 model4interfacesAdapterFactory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java	22 Aug 2009 09:34:16 -0000	1.7
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java	3 Jan 2010 09:58:02 -0000
>@@ -10,6 +10,7 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4interfaces.util;
> 
>+import org.eclipse.emf.cdo.tests.legacy.model4interfaces.*;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
> import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
> import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
>@@ -34,22 +35,21 @@
> /**
> *  The Adapter Factory for the model. It provides an adapter <code>createXXX</code>
> * method for each class of the model. 
>- * 
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage
> * @generated
> */
> public class model4interfacesAdapterFactory extends AdapterFactoryImpl
> {
> /**
>- * The cached model package.  
>- * 
>+ * The cached model package.
>+ *  
> * @generated
> */
> protected static model4interfacesPackage modelPackage;
> 
> /**
>- * Creates an instance of the adapter factory.  
>- * 
>+ * Creates an instance of the adapter factory.
>+ *  
> * @generated
> */
> public model4interfacesAdapterFactory()
>@@ -61,10 +61,10 @@
> }
> 
> /**
>- * Returns whether this factory is applicable for the type of the object.  This implementation
>+ * Returns whether this factory is applicable for the type of the object.
>+ *  This implementation
> * returns <code>true</code> if the object is either the model's package or is an instance object of the model. 
>- * 
> * @return whether this factory is applicable for the type of the object.
> * @generated
> */
>@@ -83,8 +83,8 @@
> }
> 
> /**
>- * The switch that delegates to the <code>createXXX</code> methods.  
>- * 
>+ * The switch that delegates to the <code>createXXX</code> methods.
>+ *  
> * @generated
> */
> protected model4interfacesSwitch<Adapter> modelSwitch = new model4interfacesSwitch<Adapter>()
>@@ -181,10 +181,9 @@
> };
> 
> /**
>- * Creates an adapter for the <code>target</code>.  
>- * 
>- * @param target
>- * the object to adapt.
>+ * Creates an adapter for the <code>target</code>.
>+ *  
>+ * @param target the object to adapt.
> * @return the adapter for the <code>target</code>.
> * @generated
> */
>@@ -210,12 +209,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
>- * ISingle Ref Contained Element}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement ISingle Ref Contained Element}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
> * @generated
>@@ -226,11 +223,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer ISingle Ref Non Container}
>- * '.  This default implementation returns null so that we can easily ignore cases; it's useful
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer ISingle Ref Non Container}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer
> * @generated
>@@ -241,12 +236,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
>- * ISingle Ref Non Contained Element}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement ISingle Ref Non Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
> * @generated
>@@ -272,12 +265,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
>- * IMulti Ref Contained Element}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement IMulti Ref Contained Element}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
> * @generated
>@@ -288,11 +279,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer IMulti Ref Non Container}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer IMulti Ref Non Container}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer
> * @generated
>@@ -303,12 +292,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
>- * IMulti Ref Non Contained Element}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement IMulti Ref Non Contained Element}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
> * @generated
>@@ -334,12 +321,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
>- * IContained Element No Parent Link}'.  This default implementation returns null so
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink IContained Element No Parent Link}'.
>+ *  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.
> * 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
> * @generated
>@@ -350,11 +335,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL ISingle Ref Container NPL}
>- * '.  This default implementation returns null so that we can easily ignore cases; it's useful
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL ISingle Ref Container NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL
> * @generated
>@@ -365,12 +348,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
>- * ISingle Ref Non Container NPL}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL ISingle Ref Non Container NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
> * @generated
>@@ -381,11 +362,9 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL IMulti Ref Container NPL}'.
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL IMulti Ref Container NPL}'.
> *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL
> * @generated
>@@ -396,12 +375,10 @@
> }
> 
> /**
>- * Creates a new adapter for an object of class '
>- * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
>- * IMulti Ref Non Container NPL}'.  This default implementation returns null so that
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL IMulti Ref Non Container NPL}'.
>+ *  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. 
>- * 
> * @return the new adapter.
> * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
> * @generated
>@@ -412,9 +389,9 @@
> }
> 
> /**
>- * Creates a new adapter for the default case.  This default implementation returns null.  This default implementation returns null. 
>- * 
> * @return the new adapter.
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java,v
>retrieving revision 1.7
>diff -u -r1.7 model4interfacesFactoryImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java	22 Aug 2009 09:34:16 -0000	1.7
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesFactoryImpl.java	3 Jan 2010 09:58:02 -0000
>@@ -21,22 +21,21 @@
> 
> /**
> *  An implementation of the model Factory. 
>- * 
> * @generated
> */
> public class model4interfacesFactoryImpl extends EFactoryImpl implements model4interfacesFactory
> {
> /**
>- * Creates the default factory implementation.  
>- * 
>- * @generated
>+ * Creates the default factory implementation.
>+ *  
>+ * @generated NOT
> */
> public static model4interfacesFactory init()
> {
> try
> {
> model4interfacesFactory themodel4interfacesFactory = (model4interfacesFactory)EPackage.Registry.INSTANCE
>- .getEFactory("http://www.eclipse.org/emf/CDO/tests/model4interfaces/1.0.0");
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model4interfaces/1.0.0");
> if (themodel4interfacesFactory != null)
> {
> return themodel4interfacesFactory;
>@@ -50,8 +49,8 @@
> }
> 
> /**
>- * Creates an instance of the factory.  
>- * 
>+ * Creates an instance of the factory.
>+ *  
> * @generated
> */
> public model4interfacesFactoryImpl()
>@@ -61,7 +60,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> @Override
>@@ -76,7 +74,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public model4interfacesPackage getmodel4interfacesPackage()
>@@ -86,7 +83,6 @@
> 
> /**
> *  
>- * 
> * @deprecated
> * @generated
> */
>Index: src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java,v
>retrieving revision 1.7
>diff -u -r1.7 model4interfacesPackageImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java	22 Aug 2009 09:34:16 -0000	1.7
>+++ src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java	3 Jan 2010 09:58:02 -0000
>@@ -10,22 +10,22 @@
> */
> package org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl;
> 
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer;
>-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesFactory;
> import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
>+import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
> 
> import org.eclipse.emf.ecore.EAttribute;
> import org.eclipse.emf.ecore.EClass;
>@@ -35,105 +35,90 @@
> 
> /**
> *  An implementation of the model Package. 
>- * 
> * @generated
> */
> public class model4interfacesPackageImpl extends EPackageImpl implements model4interfacesPackage
> {
> /**
> *  
>- * 
> * @generated
> */
> private EClass iSingleRefContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iSingleRefContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iSingleRefNonContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iSingleRefNonContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iMultiRefContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iMultiRefContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iMultiRefNonContainerEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iMultiRefNonContainedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iNamedElementEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iContainedElementNoParentLinkEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iSingleRefContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iSingleRefNonContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iMultiRefContainerNPLEClass = null;
> 
> /**
> *  
>- * 
> * @generated
> */
> private EClass iMultiRefNonContainerNPLEClass = null;
>@@ -158,7 +143,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> private static boolean isInited = false;
>@@ -203,7 +187,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getISingleRefContainer()
>@@ -213,7 +196,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getISingleRefContainer_Element()
>@@ -223,7 +205,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getISingleRefContainedElement()
>@@ -233,7 +214,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getISingleRefContainedElement_Parent()
>@@ -243,7 +223,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getISingleRefNonContainer()
>@@ -253,7 +232,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getISingleRefNonContainer_Element()
>@@ -263,7 +241,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getISingleRefNonContainedElement()
>@@ -273,7 +250,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getISingleRefNonContainedElement_Parent()
>@@ -283,7 +259,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIMultiRefContainer()
>@@ -293,7 +268,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getIMultiRefContainer_Elements()
>@@ -303,7 +277,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIMultiRefContainedElement()
>@@ -313,7 +286,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getIMultiRefContainedElement_Parent()
>@@ -323,7 +295,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIMultiRefNonContainer()
>@@ -333,7 +304,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getIMultiRefNonContainer_Elements()
>@@ -343,7 +313,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIMultiRefNonContainedElement()
>@@ -353,7 +322,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getIMultiRefNonContainedElement_Parent()
>@@ -363,7 +331,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getINamedElement()
>@@ -373,7 +340,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EAttribute getINamedElement_Name()
>@@ -383,7 +349,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIContainedElementNoParentLink()
>@@ -393,7 +358,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getISingleRefContainerNPL()
>@@ -403,7 +367,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getISingleRefContainerNPL_Element()
>@@ -413,7 +376,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getISingleRefNonContainerNPL()
>@@ -423,7 +385,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getISingleRefNonContainerNPL_Element()
>@@ -433,7 +394,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIMultiRefContainerNPL()
>@@ -443,7 +403,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getIMultiRefContainerNPL_Elements()
>@@ -453,7 +412,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EClass getIMultiRefNonContainerNPL()
>@@ -463,7 +421,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public EReference getIMultiRefNonContainerNPL_Elements()
>@@ -473,7 +430,6 @@
> 
> /**
> *  
>- * 
> * @generated
> */
> public model4interfacesFactory getmodel4interfacesFactory()
>@@ -483,15 +439,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Creates the meta-model objects for the package. This method is
>+ * guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void createPackageContents()
>@@ -545,15 +500,14 @@
> 
> /**
> *  
>- * 
> * @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.  
>- * 
>+ * Complete the initialization of the package and its meta-model. This
>+ * method is guarded to have no affect on any invocation but its first.
>+ *  
> * @generated
> */
> public void initializePackageContents()
>#P org.eclipse.emf.cdo.tests.model1
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF,v
>retrieving revision 1.16
>diff -u -r1.16 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Dec 2009 15:50:57 -0000	1.16
>+++ META-INF/MANIFEST.MF	3 Jan 2010 09:58:05 -0000
>@@ -10,6 +10,7 @@
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
> org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
> Export-Package: org.eclipse.emf.cdo.tests.legacy.model1,
>+ org.eclipse.emf.cdo.tests.legacy.model1.impl,
> org.eclipse.emf.cdo.tests.model1;version="3.0.0",
> org.eclipse.emf.cdo.tests.model1.impl;version="3.0.0",
> org.eclipse.emf.cdo.tests.model1.util;version="3.0.0",
>Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 Model1PackageImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java	27 Dec 2009 15:50:56 -0000	1.6
>+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java	3 Jan 2010 09:58:05 -0000
>@@ -175,7 +175,7 @@
> * @see #eNS_URI
> * @see #createPackageContents()
> * @see #initializePackageContents()
>- * @generated
>+ * @generated NOT
> */
> public static Model1Package init()
> {
>@@ -185,7 +185,7 @@
> }
> 
> // Obtain or create and register package
>- Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
>+ Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(Model1Package.eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
> .get(eNS_URI)
> : new Model1PackageImpl());
> 
>Index: src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 Model1FactoryImpl.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java	27 Dec 2009 15:50:55 -0000	1.6
>+++ src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java	3 Jan 2010 09:58:05 -0000
>@@ -53,14 +53,14 @@
> /**
> * Creates the default factory implementation.  
> * 
>- * @generated
>+ * @generated NOT
> */
> public static Model1Factory init()
> {
> try
> {
> Model1Factory theModel1Factory = (Model1Factory)EPackage.Registry.INSTANCE
>- .getEFactory("http://www.eclipse.org/emf/CDO/tests/model1/1.0.0");
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model1/1.0.0");
> if (theModel1Factory != null)
> {
> return theModel1Factory;
>Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java,v
>retrieving revision 1.6
>diff -u -r1.6 Model1Package.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java	27 Dec 2009 15:50:51 -0000	1.6
>+++ src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java	3 Jan 2010 09:58:05 -0000
>@@ -15,7 +15,6 @@
> 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;
> 
> /**
>@@ -32,7 +31,7 @@
> * @model kind="package"
> * @generated
> */
>-public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model1.Model1Package
>+public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Package
> {
> /**
> *  
>@@ -51,9 +50,9 @@
> /**
> * The package namespace URI.  
> * 
>- * @generated
>+ * @generated NOT
> */
>- String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0";
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model1/1.0.0";
> 
> /**
> * The package namespace name.  
>Index: src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java,v
>retrieving revision 1.6
>diff -u -r1.6 Model1Factory.java
>--- src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java	27 Dec 2009 15:50:54 -0000	1.6
>+++ src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java	3 Jan 2010 09:58:05 -0000
>@@ -24,8 +24,6 @@
> import org.eclipse.emf.cdo.tests.model1.SalesOrder;
> import org.eclipse.emf.cdo.tests.model1.Supplier;
> 
>-import org.eclipse.emf.ecore.EFactory;
>-
> /**
> *  The Factory for the model. It provides a create method for each non-abstract class of
> * the model. 
>@@ -33,7 +31,7 @@
> * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package
> * @generated
> */
>-public interface Model1Factory extends EFactory, org.eclipse.emf.cdo.tests.model1.Model1Factory
>+public interface Model1Factory extends org.eclipse.emf.cdo.tests.model1.Model1Factory
> {
> /**
> *  
>#P org.eclipse.emf.cdo.tests.model5
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/tests/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF,v
>retrieving revision 1.2
>diff -u -r1.2 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Jun 2009 07:23:59 -0000	1.2
>+++ META-INF/MANIFEST.MF	3 Jan 2010 09:58:07 -0000
>@@ -9,6 +9,7 @@
> Bundle-ClassPath: .
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
> org.eclipse.emf.cdo;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
>-Export-Package: org.eclipse.emf.cdo.tests.model5;version="3.0.0",
>+Export-Package: org.eclipse.emf.cdo.tests.legacy.model5,
>+ org.eclipse.emf.cdo.tests.model5;version="3.0.0",
> org.eclipse.emf.cdo.tests.model5.impl;version="3.0.0",
> org.eclipse.emf.cdo.tests.model5.util;version="3.0.0"
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfString;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of String'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<String> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfStringImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_STRING;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<String> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<String>(String.class, this, Model5Package.GEN_LIST_OF_STRING__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_STRING__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_STRING__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends String>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_STRING__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_STRING__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfStringImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,455 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.util;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfString;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EObject;
>+
>+import java.util.List;
>+
>+/**
>+ * 
>+ * The Switch 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.
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Package
>+ * @generated
>+ */
>+public class Model5Switch<T>
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached model package
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static Model5Package modelPackage;
>+
>+ /**
>+ * Creates an instance of the switch.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model5Switch()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = Model5Package.eINSTANCE;
>+ }
>+ }
>+
>+ /**
>+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @return the first non-null result returned by a <code>caseXXX</code> call.
>+ * @generated
>+ */
>+ protected T doSwitch(int classifierID, EObject theEObject)
>+ {
>+ switch (classifierID)
>+ {
>+ case Model5Package.TEST_FEATURE_MAP:
>+ {
>+ TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
>+ T result = caseTestFeatureMap(testFeatureMap);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.MANAGER:
>+ {
>+ Manager manager = (Manager)theEObject;
>+ T result = caseManager(manager);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.DOCTOR:
>+ {
>+ Doctor doctor = (Doctor)theEObject;
>+ T result = caseDoctor(doctor);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_STRING:
>+ {
>+ GenListOfString genListOfString = (GenListOfString)theEObject;
>+ T result = caseGenListOfString(genListOfString);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_INT:
>+ {
>+ GenListOfInt genListOfInt = (GenListOfInt)theEObject;
>+ T result = caseGenListOfInt(genListOfInt);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_INTEGER:
>+ {
>+ GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
>+ T result = caseGenListOfInteger(genListOfInteger);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_LONG:
>+ {
>+ GenListOfLong genListOfLong = (GenListOfLong)theEObject;
>+ T result = caseGenListOfLong(genListOfLong);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_BOOLEAN:
>+ {
>+ GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
>+ T result = caseGenListOfBoolean(genListOfBoolean);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_SHORT:
>+ {
>+ GenListOfShort genListOfShort = (GenListOfShort)theEObject;
>+ T result = caseGenListOfShort(genListOfShort);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_FLOAT:
>+ {
>+ GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
>+ T result = caseGenListOfFloat(genListOfFloat);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_DOUBLE:
>+ {
>+ GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
>+ T result = caseGenListOfDouble(genListOfDouble);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_DATE:
>+ {
>+ GenListOfDate genListOfDate = (GenListOfDate)theEObject;
>+ T result = caseGenListOfDate(genListOfDate);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ case Model5Package.GEN_LIST_OF_CHAR:
>+ {
>+ GenListOfChar genListOfChar = (GenListOfChar)theEObject;
>+ T result = caseGenListOfChar(genListOfChar);
>+ if (result == null)
>+ result = defaultCase(theEObject);
>+ return result;
>+ }
>+ default:
>+ return defaultCase(theEObject);
>+ }
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Test Feature Map'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Test Feature Map'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseTestFeatureMap(TestFeatureMap object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Manager'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Manager'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseManager(Manager object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Doctor'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Doctor'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseDoctor(Doctor object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of String'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of String'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfString(GenListOfString object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Int'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Int'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfInt(GenListOfInt object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Integer'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Integer'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfInteger(GenListOfInteger object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Long'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Long'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfLong(GenListOfLong object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Boolean'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Boolean'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfBoolean(GenListOfBoolean object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Short'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Short'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfShort(GenListOfShort object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Float'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Float'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfFloat(GenListOfFloat object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Double'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Double'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfDouble(GenListOfDouble object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Date'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Date'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfDate(GenListOfDate object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'Gen List Of Char'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'Gen List Of Char'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+ * @generated
>+ */
>+ public T caseGenListOfChar(GenListOfChar object)
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Returns the result of interpreting the object as an instance of 'EObject'.
>+ * 
>+ * This implementation returns null;
>+ * returning a non-null result will terminate the switch, but this is the last case anyway.
>+ * 
>+ * @param object the target of the switch.
>+ * @return the result of interpreting the object as an instance of 'EObject'.
>+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
>+ * @generated
>+ */
>+ public T defaultCase(EObject object)
>+ {
>+ return null;
>+ }
>+
>+} //Model5Switch
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,60 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Manager'.
>+ * 
>+ * 
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ManagerImpl extends EObjectImpl implements Manager
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected ManagerImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.MANAGER;
>+ }
>+
>+} //ManagerImpl
>Index: model/model5.legacy-genmodel
>===================================================================
>RCS file: model/model5.legacy-genmodel
>diff -N model/model5.legacy-genmodel
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ model/model5.legacy-genmodel	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,86 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" providerRootExtendsClass="">
>+ <foreignModel>model5.ecore</foreignModel>
>+ <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
>+ <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true">
>+ <ecorePackage href="model5.ecore#/"/>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//TestFeatureMap"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true">
>+ <ecoreFeature xsi:type="ecore:EReference" href="model5.ecore#//TestFeatureMap/managers"/>
>+ </genFeatures>
>+ <genFeatures property="None" notify="false" createChild="false">
>+ <ecoreFeature xsi:type="ecore:EReference" href="model5.ecore#//TestFeatureMap/doctors"/>
>+ </genFeatures>
>+ <genFeatures property="None" children="true" createChild="true">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//TestFeatureMap/people"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//Manager"/>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//Doctor"/>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfString"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfString/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfInt"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfInt/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfInteger"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfInteger/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfLong"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfLong/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfBoolean"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfBoolean/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfShort"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfShort/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfFloat"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfFloat/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfDouble"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfDouble/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfDate"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfDate/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ <genClasses>
>+ <ecoreClass href="model5.ecore#//GenListOfChar"/>
>+ <genFeatures createChild="false">
>+ <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfChar/elements"/>
>+ </genFeatures>
>+ </genClasses>
>+ </genPackages>
>+</genmodel:GenModel>
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,180 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5;
>+
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfString;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
>+
>+/**
>+ * 
>+ * The Factory for the model.
>+ * It provides a create method for each non-abstract class of the model.
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Package
>+ * @generated
>+ */
>+public interface Model5Factory extends org.eclipse.emf.cdo.tests.model5.Model5Factory
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The singleton instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ Model5Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5FactoryImpl.init();
>+
>+ /**
>+ * Returns a new object of class 'Test Feature Map'.
>+ * 
>+ * 
>+ * @return a new object of class 'Test Feature Map'.
>+ * @generated
>+ */
>+ TestFeatureMap createTestFeatureMap();
>+
>+ /**
>+ * Returns a new object of class 'Manager'.
>+ * 
>+ * 
>+ * @return a new object of class 'Manager'.
>+ * @generated
>+ */
>+ Manager createManager();
>+
>+ /**
>+ * Returns a new object of class 'Doctor'.
>+ * 
>+ * 
>+ * @return a new object of class 'Doctor'.
>+ * @generated
>+ */
>+ Doctor createDoctor();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of String'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of String'.
>+ * @generated
>+ */
>+ GenListOfString createGenListOfString();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Int'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Int'.
>+ * @generated
>+ */
>+ GenListOfInt createGenListOfInt();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Integer'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Integer'.
>+ * @generated
>+ */
>+ GenListOfInteger createGenListOfInteger();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Long'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Long'.
>+ * @generated
>+ */
>+ GenListOfLong createGenListOfLong();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Boolean'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Boolean'.
>+ * @generated
>+ */
>+ GenListOfBoolean createGenListOfBoolean();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Short'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Short'.
>+ * @generated
>+ */
>+ GenListOfShort createGenListOfShort();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Float'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Float'.
>+ * @generated
>+ */
>+ GenListOfFloat createGenListOfFloat();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Double'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Double'.
>+ * @generated
>+ */
>+ GenListOfDouble createGenListOfDouble();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Date'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Date'.
>+ * @generated
>+ */
>+ GenListOfDate createGenListOfDate();
>+
>+ /**
>+ * Returns a new object of class 'Gen List Of Char'.
>+ * 
>+ * 
>+ * @return a new object of class 'Gen List Of Char'.
>+ * @generated
>+ */
>+ GenListOfChar createGenListOfChar();
>+
>+ /**
>+ * Returns the package supported by this factory.
>+ * 
>+ * 
>+ * @return the package supported by this factory.
>+ * @generated
>+ */
>+ Model5Package getModel5Package();
>+
>+} //Model5Factory
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,293 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory;
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfString;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.impl.EFactoryImpl;
>+import org.eclipse.emf.ecore.plugin.EcorePlugin;
>+
>+/**
>+ * 
>+ * An implementation of the model Factory.
>+ * 
>+ * @generated
>+ */
>+public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * Creates the default factory implementation.
>+ * 
>+ * 
>+ * @generated NOT
>+ */
>+ public static Model5Factory init()
>+ {
>+ try
>+ {
>+ Model5Factory theModel5Factory = (Model5Factory)EPackage.Registry.INSTANCE
>+ .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/model5/1.0.0");
>+ if (theModel5Factory != null)
>+ {
>+ return theModel5Factory;
>+ }
>+ }
>+ catch (Exception exception)
>+ {
>+ EcorePlugin.INSTANCE.log(exception);
>+ }
>+ return new Model5FactoryImpl();
>+ }
>+
>+ /**
>+ * Creates an instance of the factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model5FactoryImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public EObject create(EClass eClass)
>+ {
>+ switch (eClass.getClassifierID())
>+ {
>+ case Model5Package.TEST_FEATURE_MAP:
>+ return createTestFeatureMap();
>+ case Model5Package.MANAGER:
>+ return createManager();
>+ case Model5Package.DOCTOR:
>+ return createDoctor();
>+ case Model5Package.GEN_LIST_OF_STRING:
>+ return createGenListOfString();
>+ case Model5Package.GEN_LIST_OF_INT:
>+ return createGenListOfInt();
>+ case Model5Package.GEN_LIST_OF_INTEGER:
>+ return createGenListOfInteger();
>+ case Model5Package.GEN_LIST_OF_LONG:
>+ return createGenListOfLong();
>+ case Model5Package.GEN_LIST_OF_BOOLEAN:
>+ return createGenListOfBoolean();
>+ case Model5Package.GEN_LIST_OF_SHORT:
>+ return createGenListOfShort();
>+ case Model5Package.GEN_LIST_OF_FLOAT:
>+ return createGenListOfFloat();
>+ case Model5Package.GEN_LIST_OF_DOUBLE:
>+ return createGenListOfDouble();
>+ case Model5Package.GEN_LIST_OF_DATE:
>+ return createGenListOfDate();
>+ case Model5Package.GEN_LIST_OF_CHAR:
>+ return createGenListOfChar();
>+ default:
>+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>+ }
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public TestFeatureMap createTestFeatureMap()
>+ {
>+ TestFeatureMapImpl testFeatureMap = new TestFeatureMapImpl();
>+ return testFeatureMap;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Manager createManager()
>+ {
>+ ManagerImpl manager = new ManagerImpl();
>+ return manager;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Doctor createDoctor()
>+ {
>+ DoctorImpl doctor = new DoctorImpl();
>+ return doctor;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfString createGenListOfString()
>+ {
>+ GenListOfStringImpl genListOfString = new GenListOfStringImpl();
>+ return genListOfString;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfInt createGenListOfInt()
>+ {
>+ GenListOfIntImpl genListOfInt = new GenListOfIntImpl();
>+ return genListOfInt;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfInteger createGenListOfInteger()
>+ {
>+ GenListOfIntegerImpl genListOfInteger = new GenListOfIntegerImpl();
>+ return genListOfInteger;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfLong createGenListOfLong()
>+ {
>+ GenListOfLongImpl genListOfLong = new GenListOfLongImpl();
>+ return genListOfLong;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfBoolean createGenListOfBoolean()
>+ {
>+ GenListOfBooleanImpl genListOfBoolean = new GenListOfBooleanImpl();
>+ return genListOfBoolean;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfShort createGenListOfShort()
>+ {
>+ GenListOfShortImpl genListOfShort = new GenListOfShortImpl();
>+ return genListOfShort;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfFloat createGenListOfFloat()
>+ {
>+ GenListOfFloatImpl genListOfFloat = new GenListOfFloatImpl();
>+ return genListOfFloat;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfDouble createGenListOfDouble()
>+ {
>+ GenListOfDoubleImpl genListOfDouble = new GenListOfDoubleImpl();
>+ return genListOfDouble;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfDate createGenListOfDate()
>+ {
>+ GenListOfDateImpl genListOfDate = new GenListOfDateImpl();
>+ return genListOfDate;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public GenListOfChar createGenListOfChar()
>+ {
>+ GenListOfCharImpl genListOfChar = new GenListOfCharImpl();
>+ return genListOfChar;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model5Package getModel5Package()
>+ {
>+ return (Model5Package)getEPackage();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @deprecated
>+ * @generated
>+ */
>+ @Deprecated
>+ public static Model5Package getPackage()
>+ {
>+ return Model5Package.eINSTANCE;
>+ }
>+
>+} //Model5FactoryImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Integer'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfInteger
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Integer> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfIntegerImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_INTEGER;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Integer> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Integer>(Integer.class, this, Model5Package.GEN_LIST_OF_INTEGER__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INTEGER__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INTEGER__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Integer>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INTEGER__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INTEGER__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfIntegerImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Int'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Integer> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfIntImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_INT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Integer> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Integer>(Integer.class, this, Model5Package.GEN_LIST_OF_INT__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INT__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INT__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Integer>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INT__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_INT__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfIntImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,971 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5;
>+
>+import org.eclipse.emf.ecore.EAttribute;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EReference;
>+
>+/**
>+ * 
>+ * The Package for the model.
>+ * It contains accessors for the meta objects to represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory
>+ * @model kind="package"
>+ * @generated
>+ */
>+public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Package
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The package name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNAME = "model5";
>+
>+ /**
>+ * The package namespace URI.
>+ * 
>+ * 
>+ * @generated NOT
>+ */
>+ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model5/1.0.0";
>+
>+ /**
>+ * The package namespace name.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ String eNS_PREFIX = "model5";
>+
>+ /**
>+ * The singleton instance of the package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl.init();
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl Test Feature Map}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getTestFeatureMap()
>+ * @generated
>+ */
>+ int TEST_FEATURE_MAP = 0;
>+
>+ /**
>+ * The feature id for the 'Managers' reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TEST_FEATURE_MAP__MANAGERS = 0;
>+
>+ /**
>+ * The feature id for the 'Doctors' containment reference list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TEST_FEATURE_MAP__DOCTORS = 1;
>+
>+ /**
>+ * The feature id for the 'People' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TEST_FEATURE_MAP__PEOPLE = 2;
>+
>+ /**
>+ * The number of structural features of the 'Test Feature Map' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int TEST_FEATURE_MAP_FEATURE_COUNT = 3;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl Manager}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getManager()
>+ * @generated
>+ */
>+ int MANAGER = 1;
>+
>+ /**
>+ * The number of structural features of the 'Manager' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int MANAGER_FEATURE_COUNT = 0;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl Doctor}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getDoctor()
>+ * @generated
>+ */
>+ int DOCTOR = 2;
>+
>+ /**
>+ * The number of structural features of the 'Doctor' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int DOCTOR_FEATURE_COUNT = 0;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl Gen List Of String}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfString()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_STRING = 3;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_STRING__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of String' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_STRING_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl Gen List Of Int}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInt()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_INT = 4;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_INT__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Int' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_INT_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl Gen List Of Integer}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInteger()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_INTEGER = 5;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_INTEGER__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Integer' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_INTEGER_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl Gen List Of Long}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfLong()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_LONG = 6;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_LONG__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Long' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_LONG_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl Gen List Of Boolean}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfBoolean()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_BOOLEAN = 7;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_BOOLEAN__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Boolean' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_BOOLEAN_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl Gen List Of Short}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfShort()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_SHORT = 8;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_SHORT__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Short' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_SHORT_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl Gen List Of Float}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfFloat()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_FLOAT = 9;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_FLOAT__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Float' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_FLOAT_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl Gen List Of Double}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDouble()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_DOUBLE = 10;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_DOUBLE__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Double' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_DOUBLE_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl Gen List Of Date}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDate()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_DATE = 11;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_DATE__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Date' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_DATE_FEATURE_COUNT = 1;
>+
>+ /**
>+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl Gen List Of Char}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfChar()
>+ * @generated
>+ */
>+ int GEN_LIST_OF_CHAR = 12;
>+
>+ /**
>+ * The feature id for the 'Elements' attribute list.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_CHAR__ELEMENTS = 0;
>+
>+ /**
>+ * The number of structural features of the 'Gen List Of Char' class.
>+ * 
>+ * 
>+ * @generated
>+ * @ordered
>+ */
>+ int GEN_LIST_OF_CHAR_FEATURE_COUNT = 1;
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap Test Feature Map}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Test Feature Map'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap
>+ * @generated
>+ */
>+ EClass getTestFeatureMap();
>+
>+ /**
>+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getManagers Managers}'.
>+ * 
>+ * 
>+ * @return the meta object for the reference list 'Managers'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getManagers()
>+ * @see #getTestFeatureMap()
>+ * @generated
>+ */
>+ EReference getTestFeatureMap_Managers();
>+
>+ /**
>+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getDoctors Doctors}'.
>+ * 
>+ * 
>+ * @return the meta object for the containment reference list 'Doctors'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getDoctors()
>+ * @see #getTestFeatureMap()
>+ * @generated
>+ */
>+ EReference getTestFeatureMap_Doctors();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getPeople People}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'People'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getPeople()
>+ * @see #getTestFeatureMap()
>+ * @generated
>+ */
>+ EAttribute getTestFeatureMap_People();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Manager Manager}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Manager'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Manager
>+ * @generated
>+ */
>+ EClass getManager();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Doctor Doctor}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Doctor'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Doctor
>+ * @generated
>+ */
>+ EClass getDoctor();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString Gen List Of String}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of String'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString
>+ * @generated
>+ */
>+ EClass getGenListOfString();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString#getElements()
>+ * @see #getGenListOfString()
>+ * @generated
>+ */
>+ EAttribute getGenListOfString_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt Gen List Of Int}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Int'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt
>+ * @generated
>+ */
>+ EClass getGenListOfInt();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt#getElements()
>+ * @see #getGenListOfInt()
>+ * @generated
>+ */
>+ EAttribute getGenListOfInt_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger Gen List Of Integer}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Integer'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger
>+ * @generated
>+ */
>+ EClass getGenListOfInteger();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger#getElements()
>+ * @see #getGenListOfInteger()
>+ * @generated
>+ */
>+ EAttribute getGenListOfInteger_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong Gen List Of Long}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Long'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong
>+ * @generated
>+ */
>+ EClass getGenListOfLong();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong#getElements()
>+ * @see #getGenListOfLong()
>+ * @generated
>+ */
>+ EAttribute getGenListOfLong_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean Gen List Of Boolean}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Boolean'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean
>+ * @generated
>+ */
>+ EClass getGenListOfBoolean();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean#getElements()
>+ * @see #getGenListOfBoolean()
>+ * @generated
>+ */
>+ EAttribute getGenListOfBoolean_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort Gen List Of Short}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Short'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort
>+ * @generated
>+ */
>+ EClass getGenListOfShort();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort#getElements()
>+ * @see #getGenListOfShort()
>+ * @generated
>+ */
>+ EAttribute getGenListOfShort_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat Gen List Of Float}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Float'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat
>+ * @generated
>+ */
>+ EClass getGenListOfFloat();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat#getElements()
>+ * @see #getGenListOfFloat()
>+ * @generated
>+ */
>+ EAttribute getGenListOfFloat_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble Gen List Of Double}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Double'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble
>+ * @generated
>+ */
>+ EClass getGenListOfDouble();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble#getElements()
>+ * @see #getGenListOfDouble()
>+ * @generated
>+ */
>+ EAttribute getGenListOfDouble_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate Gen List Of Date}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Date'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate
>+ * @generated
>+ */
>+ EClass getGenListOfDate();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate#getElements()
>+ * @see #getGenListOfDate()
>+ * @generated
>+ */
>+ EAttribute getGenListOfDate_Elements();
>+
>+ /**
>+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar Gen List Of Char}'.
>+ * 
>+ * 
>+ * @return the meta object for class 'Gen List Of Char'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar
>+ * @generated
>+ */
>+ EClass getGenListOfChar();
>+
>+ /**
>+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar#getElements Elements}'.
>+ * 
>+ * 
>+ * @return the meta object for the attribute list 'Elements'.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar#getElements()
>+ * @see #getGenListOfChar()
>+ * @generated
>+ */
>+ EAttribute getGenListOfChar_Elements();
>+
>+ /**
>+ * Returns the factory that creates the instances of the model.
>+ * 
>+ * 
>+ * @return the factory that creates the instances of the model.
>+ * @generated
>+ */
>+ Model5Factory getModel5Factory();
>+
>+ /**
>+ * 
>+ * Defines literals for the meta objects that represent
>+ * <ul>
>+ * <li>each class,</li>
>+ * <li>each feature of each class,</li>
>+ * <li>each enum,</li>
>+ * <li>and each data type</li>
>+ * </ul>
>+ * 
>+ * @generated
>+ */
>+ interface Literals
>+ {
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl Test Feature Map}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getTestFeatureMap()
>+ * @generated
>+ */
>+ EClass TEST_FEATURE_MAP = eINSTANCE.getTestFeatureMap();
>+
>+ /**
>+ * The meta object literal for the 'Managers' reference list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TEST_FEATURE_MAP__MANAGERS = eINSTANCE.getTestFeatureMap_Managers();
>+
>+ /**
>+ * The meta object literal for the 'Doctors' containment reference list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EReference TEST_FEATURE_MAP__DOCTORS = eINSTANCE.getTestFeatureMap_Doctors();
>+
>+ /**
>+ * The meta object literal for the 'People' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute TEST_FEATURE_MAP__PEOPLE = eINSTANCE.getTestFeatureMap_People();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl Manager}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getManager()
>+ * @generated
>+ */
>+ EClass MANAGER = eINSTANCE.getManager();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl Doctor}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getDoctor()
>+ * @generated
>+ */
>+ EClass DOCTOR = eINSTANCE.getDoctor();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl Gen List Of String}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfString()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_STRING = eINSTANCE.getGenListOfString();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_STRING__ELEMENTS = eINSTANCE.getGenListOfString_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl Gen List Of Int}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInt()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_INT = eINSTANCE.getGenListOfInt();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_INT__ELEMENTS = eINSTANCE.getGenListOfInt_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl Gen List Of Integer}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInteger()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_INTEGER = eINSTANCE.getGenListOfInteger();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_INTEGER__ELEMENTS = eINSTANCE.getGenListOfInteger_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl Gen List Of Long}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfLong()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_LONG = eINSTANCE.getGenListOfLong();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_LONG__ELEMENTS = eINSTANCE.getGenListOfLong_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl Gen List Of Boolean}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfBoolean()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_BOOLEAN = eINSTANCE.getGenListOfBoolean();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_BOOLEAN__ELEMENTS = eINSTANCE.getGenListOfBoolean_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl Gen List Of Short}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfShort()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_SHORT = eINSTANCE.getGenListOfShort();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_SHORT__ELEMENTS = eINSTANCE.getGenListOfShort_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl Gen List Of Float}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfFloat()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_FLOAT = eINSTANCE.getGenListOfFloat();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_FLOAT__ELEMENTS = eINSTANCE.getGenListOfFloat_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl Gen List Of Double}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDouble()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_DOUBLE = eINSTANCE.getGenListOfDouble();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_DOUBLE__ELEMENTS = eINSTANCE.getGenListOfDouble_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl Gen List Of Date}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDate()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_DATE = eINSTANCE.getGenListOfDate();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_DATE__ELEMENTS = eINSTANCE.getGenListOfDate_Elements();
>+
>+ /**
>+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl Gen List Of Char}' class.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfChar()
>+ * @generated
>+ */
>+ EClass GEN_LIST_OF_CHAR = eINSTANCE.getGenListOfChar();
>+
>+ /**
>+ * The meta object literal for the 'Elements' attribute list feature.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ EAttribute GEN_LIST_OF_CHAR__ELEMENTS = eINSTANCE.getGenListOfChar_Elements();
>+
>+ }
>+
>+} //Model5Package
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,665 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory;
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfString;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
>+
>+import org.eclipse.emf.ecore.EAttribute;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.EReference;
>+import org.eclipse.emf.ecore.impl.EPackageImpl;
>+
>+/**
>+ * 
>+ * An implementation of the model Package.
>+ * 
>+ * @generated
>+ */
>+public class Model5PackageImpl extends EPackageImpl implements Model5Package
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass testFeatureMapEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass managerEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass doctorEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfStringEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfIntEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfIntegerEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfLongEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfBooleanEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfShortEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfFloatEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfDoubleEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfDateEClass = null;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private EClass genListOfCharEClass = null;
>+
>+ /**
>+ * Creates an instance of the model Package, registered with
>+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
>+ * package URI value.
>+ * Note: the correct way to create the package is via the static
>+ * factory method {@link #init init()}, which also performs
>+ * initialization of the package, or returns the registered package,
>+ * if one already exists.
>+ * 
>+ * 
>+ * @see org.eclipse.emf.ecore.EPackage.Registry
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Package#eNS_URI
>+ * @see #init()
>+ * @generated
>+ */
>+ private Model5PackageImpl()
>+ {
>+ super(eNS_URI, Model5Factory.eINSTANCE);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private static boolean isInited = false;
>+
>+ /**
>+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
>+ * 
>+ * This method is used to initialize {@link Model5Package#eINSTANCE} when that field is accessed.
>+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
>+ * 
>+ * 
>+ * @see #eNS_URI
>+ * @see #createPackageContents()
>+ * @see #initializePackageContents()
>+ * @generated
>+ */
>+ public static Model5Package init()
>+ {
>+ if (isInited)
>+ return (Model5Package)EPackage.Registry.INSTANCE.getEPackage(Model5Package.eNS_URI);
>+
>+ // Obtain or create and register package
>+ Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE
>+ .get(eNS_URI)
>+ : new Model5PackageImpl());
>+
>+ isInited = true;
>+
>+ // Create package meta-data objects
>+ theModel5Package.createPackageContents();
>+
>+ // Initialize created meta-data
>+ theModel5Package.initializePackageContents();
>+
>+ // Mark meta-data to indicate it can't be changed
>+ theModel5Package.freeze();
>+
>+ // Update the registry and return the package
>+ EPackage.Registry.INSTANCE.put(Model5Package.eNS_URI, theModel5Package);
>+ return theModel5Package;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getTestFeatureMap()
>+ {
>+ return testFeatureMapEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTestFeatureMap_Managers()
>+ {
>+ return (EReference)testFeatureMapEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EReference getTestFeatureMap_Doctors()
>+ {
>+ return (EReference)testFeatureMapEClass.getEStructuralFeatures().get(1);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getTestFeatureMap_People()
>+ {
>+ return (EAttribute)testFeatureMapEClass.getEStructuralFeatures().get(2);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getManager()
>+ {
>+ return managerEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getDoctor()
>+ {
>+ return doctorEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfString()
>+ {
>+ return genListOfStringEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfString_Elements()
>+ {
>+ return (EAttribute)genListOfStringEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfInt()
>+ {
>+ return genListOfIntEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfInt_Elements()
>+ {
>+ return (EAttribute)genListOfIntEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfInteger()
>+ {
>+ return genListOfIntegerEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfInteger_Elements()
>+ {
>+ return (EAttribute)genListOfIntegerEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfLong()
>+ {
>+ return genListOfLongEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfLong_Elements()
>+ {
>+ return (EAttribute)genListOfLongEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfBoolean()
>+ {
>+ return genListOfBooleanEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfBoolean_Elements()
>+ {
>+ return (EAttribute)genListOfBooleanEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfShort()
>+ {
>+ return genListOfShortEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfShort_Elements()
>+ {
>+ return (EAttribute)genListOfShortEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfFloat()
>+ {
>+ return genListOfFloatEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfFloat_Elements()
>+ {
>+ return (EAttribute)genListOfFloatEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfDouble()
>+ {
>+ return genListOfDoubleEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfDouble_Elements()
>+ {
>+ return (EAttribute)genListOfDoubleEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfDate()
>+ {
>+ return genListOfDateEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfDate_Elements()
>+ {
>+ return (EAttribute)genListOfDateEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EClass getGenListOfChar()
>+ {
>+ return genListOfCharEClass;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EAttribute getGenListOfChar_Elements()
>+ {
>+ return (EAttribute)genListOfCharEClass.getEStructuralFeatures().get(0);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model5Factory getModel5Factory()
>+ {
>+ return (Model5Factory)getEFactoryInstance();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void createPackageContents()
>+ {
>+ if (isCreated)
>+ return;
>+ isCreated = true;
>+
>+ // Create classes and their features
>+ testFeatureMapEClass = createEClass(TEST_FEATURE_MAP);
>+ createEReference(testFeatureMapEClass, TEST_FEATURE_MAP__MANAGERS);
>+ createEReference(testFeatureMapEClass, TEST_FEATURE_MAP__DOCTORS);
>+ createEAttribute(testFeatureMapEClass, TEST_FEATURE_MAP__PEOPLE);
>+
>+ managerEClass = createEClass(MANAGER);
>+
>+ doctorEClass = createEClass(DOCTOR);
>+
>+ genListOfStringEClass = createEClass(GEN_LIST_OF_STRING);
>+ createEAttribute(genListOfStringEClass, GEN_LIST_OF_STRING__ELEMENTS);
>+
>+ genListOfIntEClass = createEClass(GEN_LIST_OF_INT);
>+ createEAttribute(genListOfIntEClass, GEN_LIST_OF_INT__ELEMENTS);
>+
>+ genListOfIntegerEClass = createEClass(GEN_LIST_OF_INTEGER);
>+ createEAttribute(genListOfIntegerEClass, GEN_LIST_OF_INTEGER__ELEMENTS);
>+
>+ genListOfLongEClass = createEClass(GEN_LIST_OF_LONG);
>+ createEAttribute(genListOfLongEClass, GEN_LIST_OF_LONG__ELEMENTS);
>+
>+ genListOfBooleanEClass = createEClass(GEN_LIST_OF_BOOLEAN);
>+ createEAttribute(genListOfBooleanEClass, GEN_LIST_OF_BOOLEAN__ELEMENTS);
>+
>+ genListOfShortEClass = createEClass(GEN_LIST_OF_SHORT);
>+ createEAttribute(genListOfShortEClass, GEN_LIST_OF_SHORT__ELEMENTS);
>+
>+ genListOfFloatEClass = createEClass(GEN_LIST_OF_FLOAT);
>+ createEAttribute(genListOfFloatEClass, GEN_LIST_OF_FLOAT__ELEMENTS);
>+
>+ genListOfDoubleEClass = createEClass(GEN_LIST_OF_DOUBLE);
>+ createEAttribute(genListOfDoubleEClass, GEN_LIST_OF_DOUBLE__ELEMENTS);
>+
>+ genListOfDateEClass = createEClass(GEN_LIST_OF_DATE);
>+ createEAttribute(genListOfDateEClass, GEN_LIST_OF_DATE__ELEMENTS);
>+
>+ genListOfCharEClass = createEClass(GEN_LIST_OF_CHAR);
>+ createEAttribute(genListOfCharEClass, GEN_LIST_OF_CHAR__ELEMENTS);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public void initializePackageContents()
>+ {
>+ if (isInitialized)
>+ return;
>+ isInitialized = true;
>+
>+ // Initialize package
>+ setName(eNAME);
>+ setNsPrefix(eNS_PREFIX);
>+ setNsURI(eNS_URI);
>+
>+ // Create type parameters
>+
>+ // Set bounds for type parameters
>+
>+ // Add supertypes to classes
>+
>+ // Initialize classes and features; add operations and parameters
>+ initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEReference(getTestFeatureMap_Managers(), this.getManager(), null, "managers", null, 0, -1,
>+ TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
>+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+ initEReference(getTestFeatureMap_Doctors(), this.getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
>+ IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+ initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1,
>+ TestFeatureMap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(managerEClass, Manager.class, "Manager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+
>+ initEClass(doctorEClass, Doctor.class, "Doctor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
>+
>+ initEClass(genListOfStringEClass, GenListOfString.class, "GenListOfString", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfString_Elements(), ecorePackage.getEString(), "elements", null, 0, -1,
>+ GenListOfString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfIntEClass, GenListOfInt.class, "GenListOfInt", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfInt_Elements(), ecorePackage.getEInt(), "elements", null, 0, -1, GenListOfInt.class,
>+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfIntegerEClass, GenListOfInteger.class, "GenListOfInteger", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfInteger_Elements(), ecorePackage.getEIntegerObject(), "elements", null, 0, -1,
>+ GenListOfInteger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfLongEClass, GenListOfLong.class, "GenListOfLong", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfLong_Elements(), ecorePackage.getELong(), "elements", null, 0, -1, GenListOfLong.class,
>+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfBooleanEClass, GenListOfBoolean.class, "GenListOfBoolean", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfBoolean_Elements(), ecorePackage.getEBoolean(), "elements", null, 0, -1,
>+ GenListOfBoolean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfShortEClass, GenListOfShort.class, "GenListOfShort", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfShort_Elements(), ecorePackage.getEShort(), "elements", null, 0, -1,
>+ GenListOfShort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfFloatEClass, GenListOfFloat.class, "GenListOfFloat", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfFloat_Elements(), ecorePackage.getEFloat(), "elements", null, 0, -1,
>+ GenListOfFloat.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfDoubleEClass, GenListOfDouble.class, "GenListOfDouble", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfDouble_Elements(), ecorePackage.getEDouble(), "elements", null, 0, -1,
>+ GenListOfDouble.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
>+ !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfDateEClass, GenListOfDate.class, "GenListOfDate", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfDate_Elements(), ecorePackage.getEDate(), "elements", null, 0, -1, GenListOfDate.class,
>+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ initEClass(genListOfCharEClass, GenListOfChar.class, "GenListOfChar", !IS_ABSTRACT, !IS_INTERFACE,
>+ IS_GENERATED_INSTANCE_CLASS);
>+ initEAttribute(getGenListOfChar_Elements(), ecorePackage.getEChar(), "elements", null, 0, -1, GenListOfChar.class,
>+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
>+
>+ // Create resource
>+ createResource(eNS_URI);
>+
>+ // Create annotations
>+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
>+ createExtendedMetaDataAnnotations();
>+ }
>+
>+ /**
>+ * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected void createExtendedMetaDataAnnotations()
>+ {
>+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
>+ addAnnotation(getTestFeatureMap_Managers(), source, new String[] { "group", "#people" });
>+ addAnnotation(getTestFeatureMap_Doctors(), source, new String[] { "group", "#people" });
>+ addAnnotation(getTestFeatureMap_People(), source, new String[] { "kind", "group" });
>+ }
>+
>+} //Model5PackageImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Char'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Character> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfCharImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_CHAR;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Character> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Character>(Character.class, this, Model5Package.GEN_LIST_OF_CHAR__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_CHAR__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_CHAR__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Character>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_CHAR__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_CHAR__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfCharImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,411 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.util;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfString;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
>+
>+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;
>+
>+/**
>+ * 
>+ * The Adapter Factory for the model.
>+ * It provides an adapter <code>createXXX</code> method for each class of the model.
>+ * 
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Package
>+ * @generated
>+ */
>+public class Model5AdapterFactory extends AdapterFactoryImpl
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached model package.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected static Model5Package modelPackage;
>+
>+ /**
>+ * Creates an instance of the adapter factory.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public Model5AdapterFactory()
>+ {
>+ if (modelPackage == null)
>+ {
>+ modelPackage = Model5Package.eINSTANCE;
>+ }
>+ }
>+
>+ /**
>+ * Returns whether this factory is applicable for the type of the object.
>+ * 
>+ * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
>+ * 
>+ * @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.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected Model5Switch<Adapter> modelSwitch = new Model5Switch<Adapter>()
>+ {
>+ @Override
>+ public Adapter caseTestFeatureMap(TestFeatureMap object)
>+ {
>+ return createTestFeatureMapAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseManager(Manager object)
>+ {
>+ return createManagerAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseDoctor(Doctor object)
>+ {
>+ return createDoctorAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfString(GenListOfString object)
>+ {
>+ return createGenListOfStringAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfInt(GenListOfInt object)
>+ {
>+ return createGenListOfIntAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfInteger(GenListOfInteger object)
>+ {
>+ return createGenListOfIntegerAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfLong(GenListOfLong object)
>+ {
>+ return createGenListOfLongAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfBoolean(GenListOfBoolean object)
>+ {
>+ return createGenListOfBooleanAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfShort(GenListOfShort object)
>+ {
>+ return createGenListOfShortAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfFloat(GenListOfFloat object)
>+ {
>+ return createGenListOfFloatAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfDouble(GenListOfDouble object)
>+ {
>+ return createGenListOfDoubleAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfDate(GenListOfDate object)
>+ {
>+ return createGenListOfDateAdapter();
>+ }
>+
>+ @Override
>+ public Adapter caseGenListOfChar(GenListOfChar object)
>+ {
>+ return createGenListOfCharAdapter();
>+ }
>+
>+ @Override
>+ public Adapter defaultCase(EObject object)
>+ {
>+ return createEObjectAdapter();
>+ }
>+ };
>+
>+ /**
>+ * Creates an adapter for the <code>target</code>.
>+ * 
>+ * 
>+ * @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.legacy.model5.TestFeatureMap Test Feature Map}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap
>+ * @generated
>+ */
>+ public Adapter createTestFeatureMapAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Manager Manager}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Manager
>+ * @generated
>+ */
>+ public Adapter createManagerAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Doctor Doctor}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.Doctor
>+ * @generated
>+ */
>+ public Adapter createDoctorAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString Gen List Of String}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString
>+ * @generated
>+ */
>+ public Adapter createGenListOfStringAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt Gen List Of Int}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt
>+ * @generated
>+ */
>+ public Adapter createGenListOfIntAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger Gen List Of Integer}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger
>+ * @generated
>+ */
>+ public Adapter createGenListOfIntegerAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong Gen List Of Long}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong
>+ * @generated
>+ */
>+ public Adapter createGenListOfLongAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean Gen List Of Boolean}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean
>+ * @generated
>+ */
>+ public Adapter createGenListOfBooleanAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort Gen List Of Short}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort
>+ * @generated
>+ */
>+ public Adapter createGenListOfShortAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat Gen List Of Float}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat
>+ * @generated
>+ */
>+ public Adapter createGenListOfFloatAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble Gen List Of Double}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble
>+ * @generated
>+ */
>+ public Adapter createGenListOfDoubleAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate Gen List Of Date}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate
>+ * @generated
>+ */
>+ public Adapter createGenListOfDateAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar Gen List Of Char}'.
>+ * 
>+ * 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.
>+ * 
>+ * @return the new adapter.
>+ * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar
>+ * @generated
>+ */
>+ public Adapter createGenListOfCharAdapter()
>+ {
>+ return null;
>+ }
>+
>+ /**
>+ * Creates a new adapter for the default case.
>+ * 
>+ * This default implementation returns null.
>+ * 
>+ * @return the new adapter.
>+ * @generated
>+ */
>+ public Adapter createEObjectAdapter()
>+ {
>+ return null;
>+ }
>+
>+} //Model5AdapterFactory
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,277 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+import org.eclipse.emf.cdo.tests.model5.Manager;
>+import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
>+
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.BasicFeatureMap;
>+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
>+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Test Feature Map'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl#getManagers Managers}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl#getDoctors Doctors}</li>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl#getPeople People}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getManagers() Managers}' reference list.
>+ * 
>+ * 
>+ * @see #getManagers()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Manager> managers;
>+
>+ /**
>+ * The cached value of the '{@link #getDoctors() Doctors}' containment reference list.
>+ * 
>+ * 
>+ * @see #getDoctors()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Doctor> doctors;
>+
>+ /**
>+ * The cached value of the '{@link #getPeople() People}' attribute list.
>+ * 
>+ * 
>+ * @see #getPeople()
>+ * @generated
>+ * @ordered
>+ */
>+ protected FeatureMap people;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected TestFeatureMapImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.TEST_FEATURE_MAP;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Manager> getManagers()
>+ {
>+ if (managers == null)
>+ {
>+ managers = new EObjectResolvingEList<Manager>(Manager.class, this, Model5Package.TEST_FEATURE_MAP__MANAGERS);
>+ }
>+ return managers;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Doctor> getDoctors()
>+ {
>+ if (doctors == null)
>+ {
>+ doctors = new EObjectContainmentEList<Doctor>(Doctor.class, this, Model5Package.TEST_FEATURE_MAP__DOCTORS);
>+ }
>+ return doctors;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public FeatureMap getPeople()
>+ {
>+ if (people == null)
>+ {
>+ people = new BasicFeatureMap(this, Model5Package.TEST_FEATURE_MAP__PEOPLE);
>+ }
>+ return people;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.TEST_FEATURE_MAP__DOCTORS:
>+ return ((InternalEList<?>)getDoctors()).basicRemove(otherEnd, msgs);
>+ case Model5Package.TEST_FEATURE_MAP__PEOPLE:
>+ return ((InternalEList<?>)getPeople()).basicRemove(otherEnd, msgs);
>+ }
>+ return super.eInverseRemove(otherEnd, featureID, msgs);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.TEST_FEATURE_MAP__MANAGERS:
>+ return getManagers();
>+ case Model5Package.TEST_FEATURE_MAP__DOCTORS:
>+ return getDoctors();
>+ case Model5Package.TEST_FEATURE_MAP__PEOPLE:
>+ if (coreType)
>+ return getPeople();
>+ return ((FeatureMap.Internal)getPeople()).getWrapper();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.TEST_FEATURE_MAP__MANAGERS:
>+ getManagers().clear();
>+ getManagers().addAll((Collection<? extends Manager>)newValue);
>+ return;
>+ case Model5Package.TEST_FEATURE_MAP__DOCTORS:
>+ getDoctors().clear();
>+ getDoctors().addAll((Collection<? extends Doctor>)newValue);
>+ return;
>+ case Model5Package.TEST_FEATURE_MAP__PEOPLE:
>+ ((FeatureMap.Internal)getPeople()).set(newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.TEST_FEATURE_MAP__MANAGERS:
>+ getManagers().clear();
>+ return;
>+ case Model5Package.TEST_FEATURE_MAP__DOCTORS:
>+ getDoctors().clear();
>+ return;
>+ case Model5Package.TEST_FEATURE_MAP__PEOPLE:
>+ getPeople().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.TEST_FEATURE_MAP__MANAGERS:
>+ return managers != null && !managers.isEmpty();
>+ case Model5Package.TEST_FEATURE_MAP__DOCTORS:
>+ return doctors != null && !doctors.isEmpty();
>+ case Model5Package.TEST_FEATURE_MAP__PEOPLE:
>+ return people != null && !people.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (people: ");
>+ result.append(people);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //TestFeatureMapImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,179 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+import java.util.Date;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Date'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Date> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfDateImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_DATE;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Date> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Date>(Date.class, this, Model5Package.GEN_LIST_OF_DATE__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DATE__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DATE__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Date>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DATE__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DATE__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfDateImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Boolean'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolean
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Boolean> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfBooleanImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_BOOLEAN;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Boolean> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeEList<Boolean>(Boolean.class, this, Model5Package.GEN_LIST_OF_BOOLEAN__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_BOOLEAN__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_BOOLEAN__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Boolean>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_BOOLEAN__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_BOOLEAN__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfBooleanImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Double'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Double> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfDoubleImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_DOUBLE;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Double> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Double>(Double.class, this, Model5Package.GEN_LIST_OF_DOUBLE__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DOUBLE__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DOUBLE__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Double>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DOUBLE__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_DOUBLE__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfDoubleImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Short'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Short> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfShortImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_SHORT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Short> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Short>(Short.class, this, Model5Package.GEN_LIST_OF_SHORT__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_SHORT__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_SHORT__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Short>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_SHORT__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_SHORT__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfShortImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Float'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Float> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfFloatImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_FLOAT;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Float> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Float>(Float.class, this, Model5Package.GEN_LIST_OF_FLOAT__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_FLOAT__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_FLOAT__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Float>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_FLOAT__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_FLOAT__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfFloatImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,60 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.Doctor;
>+
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Doctor'.
>+ * 
>+ * 
>+ * 
>+ *
>+ * @generated
>+ */
>+public class DoctorImpl extends EObjectImpl implements Doctor
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected DoctorImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.DOCTOR;
>+ }
>+
>+} //DoctorImpl
>Index: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
>===================================================================
>RCS file: src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
>diff -N src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,178 @@
>+/**
>+ * Copyright (c) 2004 - 2009 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
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
>+
>+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
>+import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
>+
>+import java.util.Collection;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Gen List Of Long'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl#getElements Elements}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
>+{
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public static final String copyright = "Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation";
>+
>+ /**
>+ * The cached value of the '{@link #getElements() Elements}' attribute list.
>+ * 
>+ * 
>+ * @see #getElements()
>+ * @generated
>+ * @ordered
>+ */
>+ protected EList<Long> elements;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ protected GenListOfLongImpl()
>+ {
>+ super();
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ protected EClass eStaticClass()
>+ {
>+ return Model5Package.Literals.GEN_LIST_OF_LONG;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public EList<Long> getElements()
>+ {
>+ if (elements == null)
>+ {
>+ elements = new EDataTypeUniqueEList<Long>(Long.class, this, Model5Package.GEN_LIST_OF_LONG__ELEMENTS);
>+ }
>+ return elements;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public Object eGet(int featureID, boolean resolve, boolean coreType)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_LONG__ELEMENTS:
>+ return getElements();
>+ }
>+ return super.eGet(featureID, resolve, coreType);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @SuppressWarnings("unchecked")
>+ @Override
>+ public void eSet(int featureID, Object newValue)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_LONG__ELEMENTS:
>+ getElements().clear();
>+ getElements().addAll((Collection<? extends Long>)newValue);
>+ return;
>+ }
>+ super.eSet(featureID, newValue);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public void eUnset(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_LONG__ELEMENTS:
>+ getElements().clear();
>+ return;
>+ }
>+ super.eUnset(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public boolean eIsSet(int featureID)
>+ {
>+ switch (featureID)
>+ {
>+ case Model5Package.GEN_LIST_OF_LONG__ELEMENTS:
>+ return elements != null && !elements.isEmpty();
>+ }
>+ return super.eIsSet(featureID);
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ if (eIsProxy())
>+ return super.toString();
>+
>+ StringBuffer result = new StringBuffer(super.toString());
>+ result.append(" (elements: ");
>+ result.append(elements);
>+ result.append(')');
>+ return result.toString();
>+ }
>+
>+} //GenListOfLongImpl

Actions: View | Diff

Attachments on bug 247226: 112514 | 112894 | 134866 | 151009 | 151634 | 151651 | 152232 | 153867 | 153868 | 155030 | 155031 | 155181 | 155182 | 155400 | 163497 | 163499