[407157] Bidirectional reference corrupted on invalidation

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=407157
Change-Id: I8047714514276963c3faeec3bce755dc02af7a4d
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>

3 files changed, 311 insertions, 266 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore
index 545672d895..11f0a163fa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore
@@ -1,100 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model3" nsURI="http://www.eclipse.org/emf/CDO/tests/model3/1.0.0"
-    nsPrefix="model3">
-  <eClassifiers xsi:type="ecore:EClass" name="Class1">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="class2" upperBound="-1"
-        eType="#//subpackage/Class2" unsettable="true" eOpposite="#//subpackage/Class2/class1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetaRef">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackageRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eClassRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eReferenceRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="Point" instanceClassName="org.eclipse.emf.cdo.tests.model3.Point">
-    <eAnnotations source="teneo.jpa">
-      <details key="value" value="@NoAuditing"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Polygon">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="points" lowerBound="1"
-        upperBound="-1" eType="#//Point"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolygonWithDuplicates">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="points" unique="false"
-        lowerBound="1" upperBound="-1" eType="#//Point"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeA">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//NodeA" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"
-        eType="#//NodeA"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeB">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//NodeB" containment="true" eOpposite="#//NodeB/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//NodeB"
-        eOpposite="#//NodeB/children"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeC">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//NodeC" containment="true" eOpposite="#//NodeC/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//NodeC"
-        eOpposite="#//NodeC/children"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"
-        eType="#//NodeC" eOpposite="#//NodeC/oppositeNodes"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="oppositeNodes" upperBound="-1"
-        eType="#//NodeC" eOpposite="#//NodeC/otherNodes"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeD">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//NodeD" containment="true" eOpposite="#//NodeD/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//NodeD"
-        eOpposite="#//NodeD/children"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"
-        eType="#//NodeD" eOpposite="#//NodeD/oppositeNode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="oppositeNode" eType="#//NodeD"
-        eOpposite="#//NodeD/otherNodes"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeE">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mainNode" eType="#//NodeA"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"
-        eType="#//NodeA"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Image">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType ../../org.eclipse.emf.cdo/model/etypes.ecore#//Blob"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="File">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType ../../org.eclipse.emf.cdo/model/etypes.ecore#//Clob"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ClassWithIDAttribute">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        iD="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ClassWithJavaClassAttribute">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" iD="true">
-      <eGenericType eClassifier="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaClass">
-        <eTypeArguments/>
-      </eGenericType>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ClassWithJavaObjectAttribute">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaObject" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"
-        iD="true"/>
-  </eClassifiers>
-  <eSubpackages name="subpackage" nsURI="http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0"
-      nsPrefix="subpackage">
-    <eClassifiers xsi:type="ecore:EClass" name="Class2">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="class1" upperBound="-1"
-          eType="#//Class1" eOpposite="#//Class1/class2"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model3" nsURI="http://www.eclipse.org/emf/CDO/tests/model3/1.0.0"

+    nsPrefix="model3">

+  <eClassifiers xsi:type="ecore:EClass" name="Class1">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="class2" upperBound="-1"

+        eType="#//subpackage/Class2" unsettable="true" eOpposite="#//subpackage/Class2/class1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MetaRef">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackageRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="eClassRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="eReferenceRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EDataType" name="Point" instanceClassName="org.eclipse.emf.cdo.tests.model3.Point">

+    <eAnnotations source="teneo.jpa">

+      <details key="value" value="@NoAuditing"/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Polygon">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="points" lowerBound="1"

+        upperBound="-1" eType="#//Point"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="PolygonWithDuplicates">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="points" unique="false"

+        lowerBound="1" upperBound="-1" eType="#//Point"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NodeA">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

+        eType="#//NodeA" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"

+        eType="#//NodeA"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NodeB">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

+        eType="#//NodeB" containment="true" eOpposite="#//NodeB/parent"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//NodeB"

+        eOpposite="#//NodeB/children"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NodeC">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

+        eType="#//NodeC" containment="true" eOpposite="#//NodeC/parent"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//NodeC"

+        eOpposite="#//NodeC/children"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"

+        eType="#//NodeC" eOpposite="#//NodeC/oppositeNodes"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="oppositeNodes" upperBound="-1"

+        eType="#//NodeC" eOpposite="#//NodeC/otherNodes"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NodeD">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

+        eType="#//NodeD" containment="true" eOpposite="#//NodeD/parent"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//NodeD"

+        eOpposite="#//NodeD/children"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"

+        eType="#//NodeD" eOpposite="#//NodeD/oppositeNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="oppositeNode" eType="#//NodeD"

+        eOpposite="#//NodeD/otherNodes"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NodeE">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="mainNode" eType="#//NodeA"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="otherNodes" upperBound="-1"

+        eType="#//NodeA"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Image">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType ../../org.eclipse.emf.cdo/model/etypes.ecore#//Blob"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="File">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType ../../org.eclipse.emf.cdo/model/etypes.ecore#//Clob"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ClassWithIDAttribute">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"

+        iD="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ClassWithJavaClassAttribute">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" iD="true">

+      <eGenericType eClassifier="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaClass">

+        <eTypeArguments/>

+      </eGenericType>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ClassWithJavaObjectAttribute">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaObject" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"

+        iD="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EdgeTarget">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingEdges" upperBound="-1"

+        eType="#//Edge" eOpposite="#//Edge/sourceNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="incomingEdges" upperBound="-1"

+        eType="#//Edge" eOpposite="#//Edge/targetNode"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NodeF" eSuperTypes="#//EdgeTarget"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Edge">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceNode" lowerBound="1"

+        eType="#//EdgeTarget" eOpposite="#//EdgeTarget/outgoingEdges"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetNode" lowerBound="1"

+        eType="#//EdgeTarget" eOpposite="#//EdgeTarget/incomingEdges"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Diagram">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="edges" upperBound="-1"

+        eType="#//Edge" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="edgeTargets" upperBound="-1"

+        eType="#//EdgeTarget" containment="true"/>

+  </eClassifiers>

+  <eSubpackages name="subpackage" nsURI="http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0"

+      nsPrefix="subpackage">

+    <eClassifiers xsi:type="ecore:EClass" name="Class2">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="class1" upperBound="-1"

+          eType="#//Class1" eOpposite="#//Class1/class2"/>

+    </eClassifiers>

+  </eSubpackages>

+</ecore:EPackage>

diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
index 9659786528..91cf992988 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
@@ -1,83 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory=""
-    editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3"
-    updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
-    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">
-  <foreignModel>model3.ecore</foreignModel>
-  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
-  <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
-      literalsInterface="false" ecorePackage="model3.ecore#/">
-    <genDataTypes ecoreDataType="model3.ecore#//Point"/>
-    <genClasses ecoreClass="model3.ecore#//Class1">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//MetaRef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eClassRef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eReferenceRef"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//Polygon">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Polygon/points"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//PolygonWithDuplicates">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//PolygonWithDuplicates/points"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeA">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/children"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeA/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/otherNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeB">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeB/children"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeB/parent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeB/name"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeC">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/children"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeC/parent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeC/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/otherNodes"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/oppositeNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeD">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/children"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeD/parent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeD/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/otherNodes"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/oppositeNode"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeE">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/mainNode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeE/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/otherNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//Image">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/height"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/data"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//File">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/data"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//ClassWithJavaClassAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaClassAttribute/javaClass"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//ClassWithJavaObjectAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaObjectAttribute/javaObject"/>
-    </genClasses>
-    <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3"
-        disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage">
-      <genClasses ecoreClass="model3.ecore#//subpackage/Class2">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference model3.ecore#//subpackage/Class2/class1"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory=""

+    editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3"

+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"

+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"

+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6"

+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">

+  <foreignModel>model3.ecore</foreignModel>

+  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>

+  <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"

+      literalsInterface="false" ecorePackage="model3.ecore#/">

+    <genDataTypes ecoreDataType="model3.ecore#//Point"/>

+    <genClasses ecoreClass="model3.ecore#//Class1">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//MetaRef">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eClassRef"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eReferenceRef"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//Polygon">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Polygon/points"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//PolygonWithDuplicates">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//PolygonWithDuplicates/points"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeA">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/children"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeA/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/otherNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeB">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeB/children"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeB/parent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeB/name"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeC">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/children"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeC/parent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeC/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/otherNodes"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/oppositeNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeD">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/children"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeD/parent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeD/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/otherNodes"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/oppositeNode"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeE">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/mainNode"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeE/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/otherNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//Image">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/width"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/height"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/data"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//File">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/data"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//ClassWithJavaClassAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaClassAttribute/javaClass"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//ClassWithJavaObjectAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaObjectAttribute/javaObject"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//EdgeTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//EdgeTarget/outgoingEdges"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//EdgeTarget/incomingEdges"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeF"/>

+    <genClasses ecoreClass="model3.ecore#//Edge">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Edge/sourceNode"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Edge/targetNode"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//Diagram">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//Diagram/edges"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//Diagram/edgeTargets"/>

+    </genClasses>

+    <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3"

+        disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage">

+      <genClasses ecoreClass="model3.ecore#//subpackage/Class2">

+        <genFeatures notify="false" createChild="false" propertySortChoices="true"

+            ecoreFeature="ecore:EReference model3.ecore#//subpackage/Class2/class1"/>

+      </genClasses>

+    </nestedGenPackages>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel
index 4f99d972dd..63034eeb83 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel
@@ -1,83 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory=""
-    editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3"
-    updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">
-  <foreignModel>model3.ecore</foreignModel>
-  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
-  <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
-      metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util"
-      literalsInterface="false" ecorePackage="model3.ecore#/">
-    <genDataTypes ecoreDataType="model3.ecore#//Point"/>
-    <genClasses ecoreClass="model3.ecore#//Class1">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//MetaRef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eClassRef"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eReferenceRef"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//Polygon">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Polygon/points"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//PolygonWithDuplicates">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//PolygonWithDuplicates/points"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeA">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/children"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeA/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/otherNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeB">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeB/children"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeB/parent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeB/name"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeC">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/children"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeC/parent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeC/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/otherNodes"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/oppositeNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeD">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/children"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeD/parent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeD/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/otherNodes"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/oppositeNode"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//NodeE">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/mainNode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeE/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/otherNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//Image">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/height"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/data"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//File">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/data"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//ClassWithJavaClassAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaClassAttribute/javaClass"/>
-    </genClasses>
-    <genClasses ecoreClass="model3.ecore#//ClassWithJavaObjectAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaObjectAttribute/javaObject"/>
-    </genClasses>
-    <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3"
-        disposableProviderFactory="true" metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl"
-        utilityPackageSuffix="legacy.util" ecorePackage="model3.ecore#//subpackage">
-      <genClasses ecoreClass="model3.ecore#//subpackage/Class2">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference model3.ecore#//subpackage/Class2/class1"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory=""

+    editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3"

+    updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">

+  <foreignModel>model3.ecore</foreignModel>

+  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>

+  <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"

+      metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util"

+      literalsInterface="false" ecorePackage="model3.ecore#/">

+    <genDataTypes ecoreDataType="model3.ecore#//Point"/>

+    <genClasses ecoreClass="model3.ecore#//Class1">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//MetaRef">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eClassRef"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/eReferenceRef"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//Polygon">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Polygon/points"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//PolygonWithDuplicates">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//PolygonWithDuplicates/points"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeA">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/children"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeA/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeA/otherNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeB">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeB/children"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeB/parent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeB/name"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeC">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/children"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeC/parent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeC/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/otherNodes"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeC/oppositeNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeD">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/children"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model3.ecore#//NodeD/parent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeD/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/otherNodes"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/oppositeNode"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeE">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/mainNode"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//NodeE/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeE/otherNodes"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//Image">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/width"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/height"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Image/data"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//File">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/data"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//ClassWithJavaClassAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaClassAttribute/javaClass"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//ClassWithJavaObjectAttribute">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaObjectAttribute/javaObject"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//EdgeTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//EdgeTarget/outgoingEdges"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//EdgeTarget/incomingEdges"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//NodeF"/>

+    <genClasses ecoreClass="model3.ecore#//Edge">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Edge/sourceNode"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Edge/targetNode"/>

+    </genClasses>

+    <genClasses ecoreClass="model3.ecore#//Diagram">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//Diagram/edges"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model3.ecore#//Diagram/edgeTargets"/>

+    </genClasses>

+    <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3"

+        disposableProviderFactory="true" metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl"

+        utilityPackageSuffix="legacy.util" ecorePackage="model3.ecore#//subpackage">

+      <genClasses ecoreClass="model3.ecore#//subpackage/Class2">

+        <genFeatures notify="false" createChild="false" propertySortChoices="true"

+            ecoreFeature="ecore:EReference model3.ecore#//subpackage/Class2/class1"/>

+      </genClasses>

+    </nestedGenPackages>

+  </genPackages>

+</genmodel:GenModel>