diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3')
24 files changed, 77 insertions, 749 deletions
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 b5257de6e3..b829d2af7b 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 @@ -9,13 +9,15 @@ <foreignModel>model3.ecore</foreignModel> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables> <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" - ecorePackage="model3.ecore#/"> + 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"/> 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 afc506870b..2e539ba97c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel @@ -10,13 +10,15 @@ <foreignModel>model3.ecore</foreignModel> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables> <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true" - ecorePackage="model3.ecore#/"> + 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"/> @@ -49,8 +51,14 @@ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//NodeD/oppositeNode"/> </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> <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3" disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage"> <genClasses ecoreClass="model3.ecore#//subpackage/Class2"> diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java index 6a6df3d9d0..73b8525399 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java @@ -895,345 +895,4 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa */ Model3Factory getModel3Factory(); - /** - * <!-- begin-user-doc --> 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> - * <!-- end-user-doc --> - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl <em>Class1</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClass1() - * @generated - */ - EClass CLASS1 = eINSTANCE.getClass1(); - - /** - * The meta object literal for the '<em><b>Class2</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl - * <em>Meta Ref</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getMetaRef() - * @generated - */ - EClass META_REF = eINSTANCE.getMetaRef(); - - /** - * The meta object literal for the '<em><b>EPackage Ref</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef(); - - /** - * The meta object literal for the '<em><b>EClass Ref</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference META_REF__ECLASS_REF = eINSTANCE.getMetaRef_EClassRef(); - - /** - * The meta object literal for the '<em><b>EReference Ref</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference META_REF__EREFERENCE_REF = eINSTANCE.getMetaRef_EReferenceRef(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl - * <em>Polygon</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getPolygon() - * @generated - */ - EClass POLYGON = eINSTANCE.getPolygon(); - - /** - * The meta object literal for the '<em><b>Points</b></em>' attribute list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute POLYGON__POINTS = eINSTANCE.getPolygon_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl - * <em>Polygon With Duplicates</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getPolygonWithDuplicates() - * @generated - */ - EClass POLYGON_WITH_DUPLICATES = eINSTANCE.getPolygonWithDuplicates(); - - /** - * The meta object literal for the '<em><b>Points</b></em>' attribute list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute POLYGON_WITH_DUPLICATES__POINTS = eINSTANCE.getPolygonWithDuplicates_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl <em>Node A</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeA() - * @generated - */ - EClass NODE_A = eINSTANCE.getNodeA(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_A__CHILDREN = eINSTANCE.getNodeA_Children(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_A__NAME = eINSTANCE.getNodeA_Name(); - - /** - * The meta object literal for the '<em><b>Other Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_A__OTHER_NODES = eINSTANCE.getNodeA_OtherNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl <em>Node B</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeB() - * @generated - */ - EClass NODE_B = eINSTANCE.getNodeB(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_B__CHILDREN = eINSTANCE.getNodeB_Children(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_B__PARENT = eINSTANCE.getNodeB_Parent(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_B__NAME = eINSTANCE.getNodeB_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl <em>Node C</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeC() - * @generated - */ - EClass NODE_C = eINSTANCE.getNodeC(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__CHILDREN = eINSTANCE.getNodeC_Children(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__PARENT = eINSTANCE.getNodeC_Parent(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_C__NAME = eINSTANCE.getNodeC_Name(); - - /** - * The meta object literal for the '<em><b>Other Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__OTHER_NODES = eINSTANCE.getNodeC_OtherNodes(); - - /** - * The meta object literal for the '<em><b>Opposite Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__OPPOSITE_NODES = eINSTANCE.getNodeC_OppositeNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl <em>Node D</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeD() - * @generated - */ - EClass NODE_D = eINSTANCE.getNodeD(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_D__CHILDREN = eINSTANCE.getNodeD_Children(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_D__PARENT = eINSTANCE.getNodeD_Parent(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_D__NAME = eINSTANCE.getNodeD_Name(); - - /** - * The meta object literal for the '<em><b>Other Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_D__OTHER_NODES = eINSTANCE.getNodeD_OtherNodes(); - - /** - * The meta object literal for the '<em><b>Opposite Node</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference NODE_D__OPPOSITE_NODE = eINSTANCE.getNodeD_OppositeNode(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl <em>Image</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getImage() - * @generated - */ - EClass IMAGE = eINSTANCE.getImage(); - - /** - * The meta object literal for the '<em><b>Width</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMAGE__WIDTH = eINSTANCE.getImage_Width(); - - /** - * The meta object literal for the '<em><b>Height</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMAGE__HEIGHT = eINSTANCE.getImage_Height(); - - /** - * The meta object literal for the '<em><b>Data</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMAGE__DATA = eINSTANCE.getImage_Data(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl <em>File</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getFile() - * @generated - */ - EClass FILE = eINSTANCE.getFile(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute FILE__NAME = eINSTANCE.getFile_Name(); - - /** - * The meta object literal for the '<em><b>Data</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute FILE__DATA = eINSTANCE.getFile_Data(); - - /** - * The meta object literal for the '<em>Point</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.Point - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getPoint() - * @generated - */ - EDataType POINT = eINSTANCE.getPoint(); - - } - } // Model3Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java index 065c2bc633..1e19d305c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java @@ -66,7 +66,7 @@ public class Class1Impl extends EObjectImpl implements Class1 @Override protected EClass eStaticClass() { - return Model3Package.Literals.CLASS1; + return Model3Package.eINSTANCE.getClass1(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java index dab1fb3d3f..fc27140cdc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java @@ -89,7 +89,7 @@ public class FileImpl extends EObjectImpl implements File @Override protected EClass eStaticClass() { - return Model3Package.Literals.FILE; + return Model3Package.eINSTANCE.getFile(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java index 6446ee9768..12bc8daede 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java @@ -111,7 +111,7 @@ public class ImageImpl extends EObjectImpl implements Image @Override protected EClass eStaticClass() { - return Model3Package.Literals.IMAGE; + return Model3Package.eINSTANCE.getImage(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java index ee25463ac6..e4b1d1c6c0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java @@ -84,7 +84,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef @Override protected EClass eStaticClass() { - return Model3Package.Literals.META_REF; + return Model3Package.eINSTANCE.getMetaRef(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java index 4eef65f772..0eb55c73ac 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java @@ -98,7 +98,7 @@ public class NodeAImpl extends EObjectImpl implements NodeA @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_A; + return Model3Package.eINSTANCE.getNodeA(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java index fc8c2e2773..5df1347e7b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java @@ -88,7 +88,7 @@ public class NodeBImpl extends EObjectImpl implements NodeB @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_B; + return Model3Package.eINSTANCE.getNodeB(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java index 797b0a3fac..37265d7bea 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java @@ -111,7 +111,7 @@ public class NodeCImpl extends EObjectImpl implements NodeC @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_C; + return Model3Package.eINSTANCE.getNodeC(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java index 521aefad7d..f7e23a2673 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java @@ -111,7 +111,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_D; + return Model3Package.eINSTANCE.getNodeD(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java index 65420f0af4..5376564972 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java @@ -62,7 +62,7 @@ public class PolygonImpl extends EObjectImpl implements Polygon @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON; + return Model3Package.eINSTANCE.getPolygon(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java index 368b8288ce..c9cd567452 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java @@ -63,7 +63,7 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON_WITH_DUPLICATES; + return Model3Package.eINSTANCE.getPolygonWithDuplicates(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java index b8f235dd1b..17e8b1751f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java @@ -892,345 +892,4 @@ public interface Model3Package extends EPackage */ Model3Factory getModel3Factory(); - /** - * <!-- begin-user-doc --> 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> - * <!-- end-user-doc --> - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl <em>Class1</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.Class1Impl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClass1() - * @generated - */ - EClass CLASS1 = eINSTANCE.getClass1(); - - /** - * The meta object literal for the '<em><b>Class2</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl <em>Meta Ref</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getMetaRef() - * @generated - */ - EClass META_REF = eINSTANCE.getMetaRef(); - - /** - * The meta object literal for the '<em><b>EPackage Ref</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef(); - - /** - * The meta object literal for the '<em><b>EClass Ref</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference META_REF__ECLASS_REF = eINSTANCE.getMetaRef_EClassRef(); - - /** - * The meta object literal for the '<em><b>EReference Ref</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference META_REF__EREFERENCE_REF = eINSTANCE.getMetaRef_EReferenceRef(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl <em>Polygon</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPolygon() - * @generated - */ - EClass POLYGON = eINSTANCE.getPolygon(); - - /** - * The meta object literal for the '<em><b>Points</b></em>' attribute list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute POLYGON__POINTS = eINSTANCE.getPolygon_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl - * <em>Polygon With Duplicates</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPolygonWithDuplicates() - * @generated - */ - EClass POLYGON_WITH_DUPLICATES = eINSTANCE.getPolygonWithDuplicates(); - - /** - * The meta object literal for the '<em><b>Points</b></em>' attribute list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute POLYGON_WITH_DUPLICATES__POINTS = eINSTANCE.getPolygonWithDuplicates_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl <em>Node A</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeA() - * @generated - */ - EClass NODE_A = eINSTANCE.getNodeA(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_A__CHILDREN = eINSTANCE.getNodeA_Children(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_A__NAME = eINSTANCE.getNodeA_Name(); - - /** - * The meta object literal for the '<em><b>Other Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_A__OTHER_NODES = eINSTANCE.getNodeA_OtherNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl <em>Node B</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeB() - * @generated - */ - EClass NODE_B = eINSTANCE.getNodeB(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_B__CHILDREN = eINSTANCE.getNodeB_Children(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_B__PARENT = eINSTANCE.getNodeB_Parent(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_B__NAME = eINSTANCE.getNodeB_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl <em>Node C</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeC() - * @generated - */ - EClass NODE_C = eINSTANCE.getNodeC(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__CHILDREN = eINSTANCE.getNodeC_Children(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__PARENT = eINSTANCE.getNodeC_Parent(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_C__NAME = eINSTANCE.getNodeC_Name(); - - /** - * The meta object literal for the '<em><b>Other Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__OTHER_NODES = eINSTANCE.getNodeC_OtherNodes(); - - /** - * The meta object literal for the '<em><b>Opposite Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_C__OPPOSITE_NODES = eINSTANCE.getNodeC_OppositeNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl <em>Node D</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeD() - * @generated - */ - EClass NODE_D = eINSTANCE.getNodeD(); - - /** - * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_D__CHILDREN = eINSTANCE.getNodeD_Children(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_D__PARENT = eINSTANCE.getNodeD_Parent(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute NODE_D__NAME = eINSTANCE.getNodeD_Name(); - - /** - * The meta object literal for the '<em><b>Other Nodes</b></em>' reference list feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference NODE_D__OTHER_NODES = eINSTANCE.getNodeD_OtherNodes(); - - /** - * The meta object literal for the '<em><b>Opposite Node</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference NODE_D__OPPOSITE_NODE = eINSTANCE.getNodeD_OppositeNode(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl <em>Image</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.ImageImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getImage() - * @generated - */ - EClass IMAGE = eINSTANCE.getImage(); - - /** - * The meta object literal for the '<em><b>Width</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMAGE__WIDTH = eINSTANCE.getImage_Width(); - - /** - * The meta object literal for the '<em><b>Height</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMAGE__HEIGHT = eINSTANCE.getImage_Height(); - - /** - * The meta object literal for the '<em><b>Data</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMAGE__DATA = eINSTANCE.getImage_Data(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl <em>File</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.impl.FileImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getFile() - * @generated - */ - EClass FILE = eINSTANCE.getFile(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute FILE__NAME = eINSTANCE.getFile_Name(); - - /** - * The meta object literal for the '<em><b>Data</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute FILE__DATA = eINSTANCE.getFile_Data(); - - /** - * The meta object literal for the '<em>Point</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model3.Point - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPoint() - * @generated - */ - EDataType POINT = eINSTANCE.getPoint(); - - } - } // Model3Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java index 7f2a9f7b74..09aeffa81c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java @@ -50,7 +50,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 @Override protected EClass eStaticClass() { - return Model3Package.Literals.CLASS1; + return Model3Package.eINSTANCE.getClass1(); } /** @@ -72,7 +72,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 @SuppressWarnings("unchecked") public EList<Class2> getClass2() { - return (EList<Class2>)eGet(Model3Package.Literals.CLASS1__CLASS2, true); + return (EList<Class2>)eGet(Model3Package.eINSTANCE.getClass1_Class2(), true); } /** @@ -82,7 +82,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 */ public void unsetClass2() { - eUnset(Model3Package.Literals.CLASS1__CLASS2); + eUnset(Model3Package.eINSTANCE.getClass1_Class2()); } /** @@ -92,7 +92,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 */ public boolean isSetClass2() { - return eIsSet(Model3Package.Literals.CLASS1__CLASS2); + return eIsSet(Model3Package.eINSTANCE.getClass1_Class2()); } } // Class1Impl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java index de66a92d82..c5911defb3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java @@ -50,7 +50,7 @@ public class FileImpl extends CDOObjectImpl implements File @Override protected EClass eStaticClass() { - return Model3Package.Literals.FILE; + return Model3Package.eINSTANCE.getFile(); } /** @@ -71,7 +71,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public String getName() { - return (String)eGet(Model3Package.Literals.FILE__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getFile_Name(), true); } /** @@ -81,7 +81,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public void setName(String newName) { - eSet(Model3Package.Literals.FILE__NAME, newName); + eSet(Model3Package.eINSTANCE.getFile_Name(), newName); } /** @@ -91,7 +91,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public CDOClob getData() { - return (CDOClob)eGet(Model3Package.Literals.FILE__DATA, true); + return (CDOClob)eGet(Model3Package.eINSTANCE.getFile_Data(), true); } /** @@ -101,7 +101,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public void setData(CDOClob newData) { - eSet(Model3Package.Literals.FILE__DATA, newData); + eSet(Model3Package.eINSTANCE.getFile_Data(), newData); } } // FileImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java index 5f5fc593be..9d69f20cd2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java @@ -51,7 +51,7 @@ public class ImageImpl extends CDOObjectImpl implements Image @Override protected EClass eStaticClass() { - return Model3Package.Literals.IMAGE; + return Model3Package.eINSTANCE.getImage(); } /** @@ -72,7 +72,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public int getWidth() { - return (Integer)eGet(Model3Package.Literals.IMAGE__WIDTH, true); + return (Integer)eGet(Model3Package.eINSTANCE.getImage_Width(), true); } /** @@ -82,7 +82,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public void setWidth(int newWidth) { - eSet(Model3Package.Literals.IMAGE__WIDTH, newWidth); + eSet(Model3Package.eINSTANCE.getImage_Width(), newWidth); } /** @@ -92,7 +92,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public int getHeight() { - return (Integer)eGet(Model3Package.Literals.IMAGE__HEIGHT, true); + return (Integer)eGet(Model3Package.eINSTANCE.getImage_Height(), true); } /** @@ -102,7 +102,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public void setHeight(int newHeight) { - eSet(Model3Package.Literals.IMAGE__HEIGHT, newHeight); + eSet(Model3Package.eINSTANCE.getImage_Height(), newHeight); } /** @@ -112,7 +112,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public CDOBlob getData() { - return (CDOBlob)eGet(Model3Package.Literals.IMAGE__DATA, true); + return (CDOBlob)eGet(Model3Package.eINSTANCE.getImage_Data(), true); } /** @@ -122,7 +122,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public void setData(CDOBlob newData) { - eSet(Model3Package.Literals.IMAGE__DATA, newData); + eSet(Model3Package.eINSTANCE.getImage_Data(), newData); } } // ImageImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java index b8bbb062ea..94cb7292da 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java @@ -51,7 +51,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef @Override protected EClass eStaticClass() { - return Model3Package.Literals.META_REF; + return Model3Package.eINSTANCE.getMetaRef(); } /** @@ -72,7 +72,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public EPackage getEPackageRef() { - return (EPackage)eGet(Model3Package.Literals.META_REF__EPACKAGE_REF, true); + return (EPackage)eGet(Model3Package.eINSTANCE.getMetaRef_EPackageRef(), true); } /** @@ -82,7 +82,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public void setEPackageRef(EPackage newEPackageRef) { - eSet(Model3Package.Literals.META_REF__EPACKAGE_REF, newEPackageRef); + eSet(Model3Package.eINSTANCE.getMetaRef_EPackageRef(), newEPackageRef); } /** @@ -92,7 +92,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public EClass getEClassRef() { - return (EClass)eGet(Model3Package.Literals.META_REF__ECLASS_REF, true); + return (EClass)eGet(Model3Package.eINSTANCE.getMetaRef_EClassRef(), true); } /** @@ -102,7 +102,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public void setEClassRef(EClass newEClassRef) { - eSet(Model3Package.Literals.META_REF__ECLASS_REF, newEClassRef); + eSet(Model3Package.eINSTANCE.getMetaRef_EClassRef(), newEClassRef); } /** @@ -112,7 +112,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public EReference getEReferenceRef() { - return (EReference)eGet(Model3Package.Literals.META_REF__EREFERENCE_REF, true); + return (EReference)eGet(Model3Package.eINSTANCE.getMetaRef_EReferenceRef(), true); } /** @@ -122,7 +122,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public void setEReferenceRef(EReference newEReferenceRef) { - eSet(Model3Package.Literals.META_REF__EREFERENCE_REF, newEReferenceRef); + eSet(Model3Package.eINSTANCE.getMetaRef_EReferenceRef(), newEReferenceRef); } } // MetaRefImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java index d6540a6730..5b0c704299 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java @@ -51,7 +51,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_A; + return Model3Package.eINSTANCE.getNodeA(); } /** @@ -73,7 +73,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA @SuppressWarnings("unchecked") public EList<NodeA> getChildren() { - return (EList<NodeA>)eGet(Model3Package.Literals.NODE_A__CHILDREN, true); + return (EList<NodeA>)eGet(Model3Package.eINSTANCE.getNodeA_Children(), true); } /** @@ -83,7 +83,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_A__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeA_Name(), true); } /** @@ -93,7 +93,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_A__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeA_Name(), newName); } /** @@ -104,7 +104,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA @SuppressWarnings("unchecked") public EList<NodeA> getOtherNodes() { - return (EList<NodeA>)eGet(Model3Package.Literals.NODE_A__OTHER_NODES, true); + return (EList<NodeA>)eGet(Model3Package.eINSTANCE.getNodeA_OtherNodes(), true); } } // NodeAImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java index c0fe4319a9..9d29799ecb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java @@ -51,7 +51,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_B; + return Model3Package.eINSTANCE.getNodeB(); } /** @@ -73,7 +73,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB @SuppressWarnings("unchecked") public EList<NodeB> getChildren() { - return (EList<NodeB>)eGet(Model3Package.Literals.NODE_B__CHILDREN, true); + return (EList<NodeB>)eGet(Model3Package.eINSTANCE.getNodeB_Children(), true); } /** @@ -83,7 +83,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public NodeB getParent() { - return (NodeB)eGet(Model3Package.Literals.NODE_B__PARENT, true); + return (NodeB)eGet(Model3Package.eINSTANCE.getNodeB_Parent(), true); } /** @@ -93,7 +93,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public void setParent(NodeB newParent) { - eSet(Model3Package.Literals.NODE_B__PARENT, newParent); + eSet(Model3Package.eINSTANCE.getNodeB_Parent(), newParent); } /** @@ -103,7 +103,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_B__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeB_Name(), true); } /** @@ -113,7 +113,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_B__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeB_Name(), newName); } } // NodeBImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java index 0b3dd821db..20a2176fcd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java @@ -53,7 +53,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_C; + return Model3Package.eINSTANCE.getNodeC(); } /** @@ -75,7 +75,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @SuppressWarnings("unchecked") public EList<NodeC> getChildren() { - return (EList<NodeC>)eGet(Model3Package.Literals.NODE_C__CHILDREN, true); + return (EList<NodeC>)eGet(Model3Package.eINSTANCE.getNodeC_Children(), true); } /** @@ -85,7 +85,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public NodeC getParent() { - return (NodeC)eGet(Model3Package.Literals.NODE_C__PARENT, true); + return (NodeC)eGet(Model3Package.eINSTANCE.getNodeC_Parent(), true); } /** @@ -95,7 +95,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public void setParent(NodeC newParent) { - eSet(Model3Package.Literals.NODE_C__PARENT, newParent); + eSet(Model3Package.eINSTANCE.getNodeC_Parent(), newParent); } /** @@ -105,7 +105,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_C__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeC_Name(), true); } /** @@ -115,7 +115,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_C__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeC_Name(), newName); } /** @@ -126,7 +126,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @SuppressWarnings("unchecked") public EList<NodeC> getOtherNodes() { - return (EList<NodeC>)eGet(Model3Package.Literals.NODE_C__OTHER_NODES, true); + return (EList<NodeC>)eGet(Model3Package.eINSTANCE.getNodeC_OtherNodes(), true); } /** @@ -137,7 +137,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @SuppressWarnings("unchecked") public EList<NodeC> getOppositeNodes() { - return (EList<NodeC>)eGet(Model3Package.Literals.NODE_C__OPPOSITE_NODES, true); + return (EList<NodeC>)eGet(Model3Package.eINSTANCE.getNodeC_OppositeNodes(), true); } } // NodeCImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java index a034d5baef..4645c77171 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java @@ -53,7 +53,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_D; + return Model3Package.eINSTANCE.getNodeD(); } /** @@ -75,7 +75,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD @SuppressWarnings("unchecked") public EList<NodeD> getChildren() { - return (EList<NodeD>)eGet(Model3Package.Literals.NODE_D__CHILDREN, true); + return (EList<NodeD>)eGet(Model3Package.eINSTANCE.getNodeD_Children(), true); } /** @@ -85,7 +85,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public NodeD getParent() { - return (NodeD)eGet(Model3Package.Literals.NODE_D__PARENT, true); + return (NodeD)eGet(Model3Package.eINSTANCE.getNodeD_Parent(), true); } /** @@ -95,7 +95,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public void setParent(NodeD newParent) { - eSet(Model3Package.Literals.NODE_D__PARENT, newParent); + eSet(Model3Package.eINSTANCE.getNodeD_Parent(), newParent); } /** @@ -105,7 +105,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_D__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeD_Name(), true); } /** @@ -115,7 +115,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_D__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeD_Name(), newName); } /** @@ -126,7 +126,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD @SuppressWarnings("unchecked") public EList<NodeD> getOtherNodes() { - return (EList<NodeD>)eGet(Model3Package.Literals.NODE_D__OTHER_NODES, true); + return (EList<NodeD>)eGet(Model3Package.eINSTANCE.getNodeD_OtherNodes(), true); } /** @@ -136,7 +136,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public NodeD getOppositeNode() { - return (NodeD)eGet(Model3Package.Literals.NODE_D__OPPOSITE_NODE, true); + return (NodeD)eGet(Model3Package.eINSTANCE.getNodeD_OppositeNode(), true); } /** @@ -146,7 +146,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public void setOppositeNode(NodeD newOppositeNode) { - eSet(Model3Package.Literals.NODE_D__OPPOSITE_NODE, newOppositeNode); + eSet(Model3Package.eINSTANCE.getNodeD_OppositeNode(), newOppositeNode); } } // NodeDImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java index 19b57bdeaa..23c36bb064 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java @@ -50,7 +50,7 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON; + return Model3Package.eINSTANCE.getPolygon(); } /** @@ -72,7 +72,7 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon @SuppressWarnings("unchecked") public EList<Point> getPoints() { - return (EList<Point>)eGet(Model3Package.Literals.POLYGON__POINTS, true); + return (EList<Point>)eGet(Model3Package.eINSTANCE.getPolygon_Points(), true); } } // PolygonImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java index e09212c0c6..69f82a5a4f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java @@ -51,7 +51,7 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON_WITH_DUPLICATES; + return Model3Package.eINSTANCE.getPolygonWithDuplicates(); } /** @@ -73,7 +73,7 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW @SuppressWarnings("unchecked") public EList<Point> getPoints() { - return (EList<Point>)eGet(Model3Package.Literals.POLYGON_WITH_DUPLICATES__POINTS, true); + return (EList<Point>)eGet(Model3Package.eINSTANCE.getPolygonWithDuplicates_Points(), true); } } // PolygonWithDuplicatesImpl |