diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3/src')
60 files changed, 1548 insertions, 1504 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java index a0cb6ec244..a2f7c67636 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Factory.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.tests.legacy.model3; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -24,102 +25,110 @@ import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package * @generated */ public interface Model3Factory extends org.eclipse.emf.cdo.tests.model3.Model3Factory { /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model3Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3FactoryImpl.init(); /** - * Returns a new object of class '<em>Class1</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Class1</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Class1</em>'. * @generated */ Class1 createClass1(); /** - * Returns a new object of class '<em>Meta Ref</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Meta Ref</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Meta Ref</em>'. * @generated */ MetaRef createMetaRef(); /** - * Returns a new object of class '<em>Polygon</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Polygon</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Polygon</em>'. * @generated */ Polygon createPolygon(); /** - * Returns a new object of class '<em>Polygon With Duplicates</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Polygon With Duplicates</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Polygon With Duplicates</em>'. * @generated */ PolygonWithDuplicates createPolygonWithDuplicates(); /** - * Returns a new object of class '<em>Node A</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node A</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node A</em>'. * @generated */ NodeA createNodeA(); /** - * Returns a new object of class '<em>Node B</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node B</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node B</em>'. * @generated */ NodeB createNodeB(); /** - * Returns a new object of class '<em>Node C</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node C</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node C</em>'. * @generated */ NodeC createNodeC(); /** - * Returns a new object of class '<em>Node D</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node D</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node D</em>'. * @generated */ NodeD createNodeD(); /** - * Returns a new object of class '<em>Image</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Image</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Image</em>'. * @generated */ Image createImage(); /** - * Returns a new object of class '<em>File</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>File</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>File</em>'. * @generated */ File createFile(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Class With ID Attribute</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Class With ID Attribute</em>'. + * @generated + */ + ClassWithIDAttribute createClassWithIDAttribute(); + + /** + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.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 73b8525399..e2a86cb8b3 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 @@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory * @model kind="package" * @generated @@ -32,8 +31,8 @@ import org.eclipse.emf.ecore.EReference; public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Package { /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "model3"; @@ -46,15 +45,15 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "model3"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl.init(); @@ -62,7 +61,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -70,25 +68,24 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int CLASS1 = 0; /** - * The feature id for the '<em><b>Class2</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Class2</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CLASS1__CLASS2 = 0; /** - * The number of structural features of the '<em>Class1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Class1</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CLASS1_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl <em>Meta Ref</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id 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 @@ -96,41 +93,40 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int META_REF = 1; /** - * The feature id for the '<em><b>EPackage Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>EPackage Ref</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF__EPACKAGE_REF = 0; /** - * The feature id for the '<em><b>EClass Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>EClass Ref</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF__ECLASS_REF = 1; /** - * The feature id for the '<em><b>EReference Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>EReference Ref</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF__EREFERENCE_REF = 2; /** - * The number of structural features of the '<em>Meta Ref</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Meta Ref</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl <em>Polygon</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id 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 @@ -138,25 +134,24 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int POLYGON = 2; /** - * The feature id for the '<em><b>Points</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Points</b></em>' attribute list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int POLYGON__POINTS = 0; /** - * The number of structural features of the '<em>Polygon</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Polygon</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int POLYGON_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl - * <em>Polygon With Duplicates</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id 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 @@ -164,17 +159,17 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int POLYGON_WITH_DUPLICATES = 3; /** - * The feature id for the '<em><b>Points</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Points</b></em>' attribute list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int POLYGON_WITH_DUPLICATES__POINTS = 0; /** - * The number of structural features of the '<em>Polygon With Duplicates</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Polygon With Duplicates</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ @@ -183,7 +178,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -191,33 +185,33 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_A = 4; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_A__CHILDREN = 0; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_A__NAME = 1; /** - * The feature id for the '<em><b>Other Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Other Nodes</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_A__OTHER_NODES = 2; /** - * The number of structural features of the '<em>Node A</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node A</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -226,7 +220,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -234,33 +227,33 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_B = 5; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_B__CHILDREN = 0; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Parent</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_B__PARENT = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_B__NAME = 2; /** - * The number of structural features of the '<em>Node B</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node B</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -269,7 +262,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -277,33 +269,33 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_C = 6; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_C__CHILDREN = 0; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Parent</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_C__PARENT = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_C__NAME = 2; /** - * The feature id for the '<em><b>Other Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Other Nodes</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -319,8 +311,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_C__OPPOSITE_NODES = 4; /** - * The number of structural features of the '<em>Node C</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node C</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -329,7 +321,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -337,49 +328,49 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_D = 7; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_D__CHILDREN = 0; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Parent</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__PARENT = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__NAME = 2; /** - * The feature id for the '<em><b>Other Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Other Nodes</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__OTHER_NODES = 3; /** - * The feature id for the '<em><b>Opposite Node</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Opposite Node</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__OPPOSITE_NODE = 4; /** - * The number of structural features of the '<em>Node D</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node D</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -388,7 +379,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -396,32 +386,32 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int IMAGE = 8; /** - * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Width</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int IMAGE__WIDTH = 0; /** - * The feature id for the '<em><b>Height</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Height</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int IMAGE__HEIGHT = 1; /** - * The feature id for the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Data</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int IMAGE__DATA = 2; /** - * The number of structural features of the '<em>Image</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Image</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -430,7 +420,6 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The meta object id 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 @@ -438,37 +427,65 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int FILE = 9; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int FILE__NAME = 0; /** - * The feature id for the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Data</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int FILE__DATA = 1; /** - * The number of structural features of the '<em>File</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>File</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int FILE_FEATURE_COUNT = 2; /** - * The meta object id for the '<em>Point</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithIDAttributeImpl <em>Class With ID Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithIDAttributeImpl + * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClassWithIDAttribute() + * @generated + */ + int CLASS_WITH_ID_ATTRIBUTE = 10; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_ID_ATTRIBUTE__ID = 0; + + /** + * The number of structural features of the '<em>Class With ID Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_ID_ATTRIBUTE_FEATURE_COUNT = 1; + + /** + * The meta object id 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 */ - int POINT = 10; + int POINT = 11; /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1 <em>Class1</em>}'. <!-- @@ -481,9 +498,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getClass1(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 - * <em>Class2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2 <em>Class2</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Class2</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1#getClass2() * @see #getClass1() @@ -502,9 +518,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getMetaRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef - * <em>EPackage Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef <em>EPackage Ref</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>EPackage Ref</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEPackageRef() * @see #getMetaRef() @@ -513,9 +528,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getMetaRef_EPackageRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEClassRef - * <em>EClass Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEClassRef <em>EClass Ref</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>EClass Ref</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEClassRef() * @see #getMetaRef() @@ -524,9 +538,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getMetaRef_EClassRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEReferenceRef - * <em>EReference Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEReferenceRef <em>EReference Ref</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>EReference Ref</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEReferenceRef() * @see #getMetaRef() @@ -545,9 +558,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getPolygon(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Polygon#getPoints - * <em>Points</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model3.Polygon#getPoints <em>Points</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Points</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Polygon#getPoints() * @see #getPolygon() @@ -556,9 +568,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getPolygon_Points(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates - * <em>Polygon With Duplicates</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates <em>Polygon With Duplicates</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Polygon With Duplicates</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates * @generated @@ -588,10 +599,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getNodeA(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getChildren() * @see #getNodeA() @@ -600,9 +610,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeA_Children(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getName - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getName() * @see #getNodeA() @@ -611,9 +620,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getNodeA_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getOtherNodes - * <em>Other Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Other Nodes</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getOtherNodes() * @see #getNodeA() @@ -632,10 +640,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getNodeB(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getChildren() * @see #getNodeB() @@ -644,10 +651,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeB_Children(); /** - * Returns the meta object for the container reference ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getParent <em>Parent</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the container reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getParent() * @see #getNodeB() @@ -656,9 +662,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeB_Parent(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getName - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getName() * @see #getNodeB() @@ -677,10 +682,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getNodeC(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getChildren() * @see #getNodeC() @@ -689,10 +693,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeC_Children(); /** - * Returns the meta object for the container reference ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getParent <em>Parent</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the container reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getParent() * @see #getNodeC() @@ -701,9 +704,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeC_Parent(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getName - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getName() * @see #getNodeC() @@ -712,9 +714,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getNodeC_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getOtherNodes - * <em>Other Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Other Nodes</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getOtherNodes() * @see #getNodeC() @@ -745,10 +746,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getNodeD(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getChildren() * @see #getNodeD() @@ -757,10 +757,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeD_Children(); /** - * Returns the meta object for the container reference ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getParent <em>Parent</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the container reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getParent() * @see #getNodeD() @@ -769,9 +768,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeD_Parent(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getName - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getName() * @see #getNodeD() @@ -780,9 +778,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getNodeD_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOtherNodes - * <em>Other Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Other Nodes</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOtherNodes() * @see #getNodeD() @@ -791,9 +788,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EReference getNodeD_OtherNodes(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOppositeNode - * <em>Opposite Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOppositeNode <em>Opposite Node</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Opposite Node</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOppositeNode() * @see #getNodeD() @@ -812,9 +808,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getImage(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getWidth - * <em>Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getWidth <em>Width</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Width</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Image#getWidth() * @see #getImage() @@ -823,9 +818,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getImage_Width(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getHeight - * <em>Height</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getHeight <em>Height</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Height</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Image#getHeight() * @see #getImage() @@ -834,9 +828,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getImage_Height(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getData - * <em>Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getData <em>Data</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Data</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Image#getData() * @see #getImage() @@ -855,9 +848,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EClass getFile(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.File#getName - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.File#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.File#getName() * @see #getFile() @@ -866,9 +858,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getFile_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.File#getData - * <em>Data</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.File#getData <em>Data</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Data</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.File#getData() * @see #getFile() @@ -877,6 +868,27 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getFile_Data(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute <em>Class With ID Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Class With ID Attribute</em>'. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute + * @generated + */ + EClass getClassWithIDAttribute(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute#getId <em>Id</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute#getId() + * @see #getClassWithIDAttribute() + * @generated + */ + EAttribute getClassWithIDAttribute_Id(); + + /** * Returns the meta object for data type '{@link org.eclipse.emf.cdo.tests.model3.Point <em>Point</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -888,8 +900,8 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EDataType getPoint(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.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 1e19d305c6..69d3eb24e6 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 @@ -30,18 +30,18 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl#getClass2 <em>Class2</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl#getClass2 <em>Class2</em>}</li> * </ul> * </p> - * + * * @generated */ public class Class1Impl extends EObjectImpl implements Class1 { /** - * The cached value of the '{@link #getClass2() <em>Class2</em>}' reference list. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getClass2() <em>Class2</em>}' reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getClass2() * @generated * @ordered @@ -50,7 +50,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected Class1Impl() @@ -60,7 +59,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -71,7 +69,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Class2> getClass2() @@ -86,7 +83,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void unsetClass2() @@ -97,7 +93,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isSetClass2() @@ -107,7 +102,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -124,7 +118,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -140,7 +133,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -156,7 +148,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -175,7 +166,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -192,7 +182,6 @@ public class Class1Impl extends EObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithIDAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithIDAttributeImpl.java new file mode 100644 index 0000000000..07fdb2c56d --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithIDAttributeImpl.java @@ -0,0 +1,184 @@ +/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.legacy.model3.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
+import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Class With ID Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithIDAttributeImpl#getId <em>Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithIDAttribute
+{
+ /**
+ * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getId()
+ * @generated
+ * @ordered
+ */
+ protected static final String ID_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getId()
+ * @generated
+ * @ordered
+ */
+ protected String id = ID_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ClassWithIDAttributeImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return Model3Package.eINSTANCE.getClassWithIDAttribute();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getId()
+ {
+ return id;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setId(String newId)
+ {
+ String oldId = id;
+ id = newId;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_ID_ATTRIBUTE__ID, oldId, id));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case Model3Package.CLASS_WITH_ID_ATTRIBUTE__ID:
+ return getId();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case Model3Package.CLASS_WITH_ID_ATTRIBUTE__ID:
+ setId((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case Model3Package.CLASS_WITH_ID_ATTRIBUTE__ID:
+ setId(ID_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case Model3Package.CLASS_WITH_ID_ATTRIBUTE__ID:
+ return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy())
+ return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (id: ");
+ result.append(id);
+ result.append(')');
+ return result.toString();
+ }
+
+} //ClassWithIDAttributeImpl
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 fc27140cdc..6ac499804a 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 @@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl#getData <em>Data</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl#getData <em>Data</em>}</li> * </ul> * </p> - * + * * @generated */ public class FileImpl extends EObjectImpl implements File @@ -44,8 +44,8 @@ public class FileImpl extends EObjectImpl implements File protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -63,8 +63,8 @@ public class FileImpl extends EObjectImpl implements File protected static final CDOClob DATA_EDEFAULT = null; /** - * The cached value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getData() <em>Data</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getData() * @generated * @ordered @@ -73,7 +73,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected FileImpl() @@ -83,7 +82,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -94,7 +92,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -104,7 +101,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -117,7 +113,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOClob getData() @@ -127,7 +122,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setData(CDOClob newData) @@ -140,7 +134,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -158,7 +151,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -178,7 +170,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -198,7 +189,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -216,7 +206,6 @@ public class FileImpl extends EObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 12bc8daede..ee4ad251c6 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 @@ -24,12 +24,12 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl#getWidth <em>Width</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl#getHeight <em>Height</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl#getData <em>Data</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl#getWidth <em>Width</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl#getHeight <em>Height</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl#getData <em>Data</em>}</li> * </ul> * </p> - * + * * @generated */ public class ImageImpl extends EObjectImpl implements Image @@ -55,9 +55,9 @@ public class ImageImpl extends EObjectImpl implements Image protected int width = WIDTH_EDEFAULT; /** - * The default value of the '{@link #getHeight() <em>Height</em>}' attribute. <!-- begin-user-doc --> <!-- + * The default value of the '{@link #getHeight() <em>Height</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getHeight() * @generated * @ordered @@ -85,8 +85,8 @@ public class ImageImpl extends EObjectImpl implements Image protected static final CDOBlob DATA_EDEFAULT = null; /** - * The cached value of the '{@link #getData() <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getData() <em>Data</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getData() * @generated * @ordered @@ -95,7 +95,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected ImageImpl() @@ -105,7 +104,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -116,7 +114,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getWidth() @@ -126,7 +123,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setWidth(int newWidth) @@ -139,7 +135,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getHeight() @@ -149,7 +144,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setHeight(int newHeight) @@ -162,7 +156,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOBlob getData() @@ -172,7 +165,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setData(CDOBlob newData) @@ -185,7 +177,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -205,7 +196,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -228,7 +218,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -251,7 +240,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -271,7 +259,6 @@ public class ImageImpl extends EObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 e4b1d1c6c0..e74bdf1e61 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 @@ -26,20 +26,20 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEPackageRef <em>EPackage Ref</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEClassRef <em>EClass Ref</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEReferenceRef <em>EReference Ref</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEPackageRef <em>EPackage Ref</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEClassRef <em>EClass Ref</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl#getEReferenceRef <em>EReference Ref</em>}</li> * </ul> * </p> - * + * * @generated */ public class MetaRefImpl extends EObjectImpl implements MetaRef { /** - * The cached value of the '{@link #getEPackageRef() <em>EPackage Ref</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getEPackageRef() <em>EPackage Ref</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getEPackageRef() * @generated * @ordered @@ -47,9 +47,9 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef protected EPackage ePackageRef; /** - * The cached value of the '{@link #getEClassRef() <em>EClass Ref</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getEClassRef() <em>EClass Ref</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getEClassRef() * @generated * @ordered @@ -57,9 +57,9 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef protected EClass eClassRef; /** - * The cached value of the '{@link #getEReferenceRef() <em>EReference Ref</em>}' reference. <!-- begin-user-doc --> + * The cached value of the '{@link #getEReferenceRef() <em>EReference Ref</em>}' reference. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getEReferenceRef() * @generated * @ordered @@ -68,7 +68,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected MetaRefImpl() @@ -78,7 +77,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -89,7 +87,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EPackage getEPackageRef() @@ -110,7 +107,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EPackage basicGetEPackageRef() @@ -120,7 +116,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setEPackageRef(EPackage newEPackageRef) @@ -134,7 +129,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getEClassRef() @@ -155,7 +149,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass basicGetEClassRef() @@ -165,7 +158,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setEClassRef(EClass newEClassRef) @@ -178,7 +170,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getEReferenceRef() @@ -199,7 +190,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference basicGetEReferenceRef() @@ -209,7 +199,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setEReferenceRef(EReference newEReferenceRef) @@ -223,7 +212,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -249,7 +237,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -272,7 +259,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -295,7 +281,6 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java index e4022fd241..39e74e4c36 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3FactoryImpl.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.tests.legacy.model3.impl; import org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory; import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -33,7 +34,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory @@ -62,8 +62,8 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model3FactoryImpl() @@ -73,7 +73,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -101,6 +100,8 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory return createImage(); case Model3Package.FILE: return createFile(); + case Model3Package.CLASS_WITH_ID_ATTRIBUTE: + return createClassWithIDAttribute(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -108,7 +109,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -125,7 +125,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -142,7 +141,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Class1 createClass1() @@ -153,7 +151,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public MetaRef createMetaRef() @@ -164,7 +161,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Polygon createPolygon() @@ -175,7 +171,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public PolygonWithDuplicates createPolygonWithDuplicates() @@ -186,7 +181,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeA createNodeA() @@ -197,7 +191,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeB createNodeB() @@ -208,7 +201,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeC createNodeC() @@ -219,7 +211,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD createNodeD() @@ -230,7 +221,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Image createImage() @@ -241,7 +231,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public File createFile() @@ -251,6 +240,17 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ClassWithIDAttribute createClassWithIDAttribute() + { + ClassWithIDAttributeImpl classWithIDAttribute = new ClassWithIDAttributeImpl(); + return classWithIDAttribute; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated NOT @@ -272,7 +272,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Package getModel3Package() @@ -282,7 +281,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java index f3e1f17dba..6cce9c9466 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java @@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -37,84 +38,79 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class Model3PackageImpl extends EPackageImpl implements Model3Package { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass class1EClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass metaRefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass polygonEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass polygonWithDuplicatesEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeAEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeBEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeCEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeDEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass imageEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass fileEClass = null; /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass classWithIDAttributeEClass = null; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType pointEDataType = null; @@ -139,18 +135,17 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * <p> - * This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed. Clients should not - * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> - * <!-- end-user-doc --> * + * <p>This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -193,7 +188,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClass1() @@ -203,7 +197,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getClass1_Class2() @@ -213,7 +206,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getMetaRef() @@ -223,7 +215,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EPackageRef() @@ -233,7 +224,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EClassRef() @@ -243,7 +233,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EReferenceRef() @@ -253,7 +242,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygon() @@ -263,7 +251,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygon_Points() @@ -273,7 +260,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygonWithDuplicates() @@ -283,7 +269,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygonWithDuplicates_Points() @@ -293,7 +278,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeA() @@ -303,7 +287,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_Children() @@ -313,7 +296,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeA_Name() @@ -323,7 +305,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_OtherNodes() @@ -333,7 +314,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeB() @@ -343,7 +323,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Children() @@ -353,7 +332,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Parent() @@ -363,7 +341,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeB_Name() @@ -373,7 +350,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeC() @@ -383,7 +359,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Children() @@ -393,7 +368,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Parent() @@ -403,7 +377,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeC_Name() @@ -413,7 +386,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OtherNodes() @@ -423,7 +395,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OppositeNodes() @@ -433,7 +404,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeD() @@ -443,7 +413,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Children() @@ -453,7 +422,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Parent() @@ -463,7 +431,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeD_Name() @@ -473,7 +440,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OtherNodes() @@ -483,7 +449,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OppositeNode() @@ -493,7 +458,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getImage() @@ -503,7 +467,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Width() @@ -513,7 +476,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Height() @@ -523,7 +485,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Data() @@ -533,7 +494,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getFile() @@ -543,7 +503,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Name() @@ -553,7 +512,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Data() @@ -562,8 +520,27 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getClassWithIDAttribute() + { + return classWithIDAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClassWithIDAttribute_Id() + { + return (EAttribute)classWithIDAttributeEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getPoint() @@ -573,7 +550,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Factory getModel3Factory() @@ -583,15 +559,14 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() @@ -648,21 +623,23 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package createEAttribute(fileEClass, FILE__NAME); createEAttribute(fileEClass, FILE__DATA); + classWithIDAttributeEClass = createEClass(CLASS_WITH_ID_ATTRIBUTE); + createEAttribute(classWithIDAttributeEClass, CLASS_WITH_ID_ATTRIBUTE__ID); + // Create data types pointEDataType = createEDataType(POINT); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() @@ -784,6 +761,12 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package initEAttribute(getFile_Data(), theEtypesPackage.getClob(), "data", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(classWithIDAttributeEClass, ClassWithIDAttribute.class, "ClassWithIDAttribute", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getClassWithIDAttribute_Id(), theEcorePackage.getEString(), "id", null, 0, 1, + ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + // Initialize data types initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); 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 0eb55c73ac..c2c35f2264 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 @@ -31,20 +31,20 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl#getOtherNodes <em>Other Nodes</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeAImpl extends EObjectImpl implements NodeA { /** - * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!-- begin-user-doc + * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getChildren() * @generated * @ordered @@ -62,8 +62,8 @@ public class NodeAImpl extends EObjectImpl implements NodeA protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -71,9 +71,9 @@ public class NodeAImpl extends EObjectImpl implements NodeA protected String name = NAME_EDEFAULT; /** - * The cached value of the '{@link #getOtherNodes() <em>Other Nodes</em>}' reference list. <!-- begin-user-doc --> + * The cached value of the '{@link #getOtherNodes() <em>Other Nodes</em>}' reference list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getOtherNodes() * @generated * @ordered @@ -82,7 +82,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeAImpl() @@ -92,7 +91,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -103,7 +101,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeA> getChildren() @@ -117,7 +114,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -127,7 +123,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -140,7 +135,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeA> getOtherNodes() @@ -154,7 +148,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -170,7 +163,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -190,7 +182,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -216,7 +207,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -239,7 +229,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -259,7 +248,6 @@ public class NodeAImpl extends EObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 5df1347e7b..7c46b3c1bd 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 @@ -31,20 +31,20 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl#getName <em>Name</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeBImpl extends EObjectImpl implements NodeB { /** - * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!-- begin-user-doc + * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getChildren() * @generated * @ordered @@ -62,8 +62,8 @@ public class NodeBImpl extends EObjectImpl implements NodeB protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -72,7 +72,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeBImpl() @@ -82,7 +81,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -93,7 +91,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeB> getChildren() @@ -108,7 +105,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeB getParent() @@ -120,7 +116,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetParent(NodeB newParent, NotificationChain msgs) @@ -131,7 +126,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setParent(NodeB newParent) @@ -156,7 +150,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -166,7 +159,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -179,7 +171,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -200,7 +191,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -218,7 +208,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -234,7 +223,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -254,7 +242,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -279,7 +266,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -302,7 +288,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -322,7 +307,6 @@ public class NodeBImpl extends EObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 37265d7bea..308b11f510 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 @@ -32,22 +32,22 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getOtherNodes <em>Other Nodes</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getOppositeNodes <em>Opposite Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl#getOppositeNodes <em>Opposite Nodes</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeCImpl extends EObjectImpl implements NodeC { /** - * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!-- begin-user-doc + * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getChildren() * @generated * @ordered @@ -65,8 +65,8 @@ public class NodeCImpl extends EObjectImpl implements NodeC protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -74,9 +74,9 @@ public class NodeCImpl extends EObjectImpl implements NodeC protected String name = NAME_EDEFAULT; /** - * The cached value of the '{@link #getOtherNodes() <em>Other Nodes</em>}' reference list. <!-- begin-user-doc --> + * The cached value of the '{@link #getOtherNodes() <em>Other Nodes</em>}' reference list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getOtherNodes() * @generated * @ordered @@ -84,9 +84,9 @@ public class NodeCImpl extends EObjectImpl implements NodeC protected EList<NodeC> otherNodes; /** - * The cached value of the '{@link #getOppositeNodes() <em>Opposite Nodes</em>}' reference list. <!-- begin-user-doc + * The cached value of the '{@link #getOppositeNodes() <em>Opposite Nodes</em>}' reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getOppositeNodes() * @generated * @ordered @@ -95,7 +95,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeCImpl() @@ -105,7 +104,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -116,7 +114,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeC> getChildren() @@ -131,7 +128,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeC getParent() @@ -143,7 +139,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetParent(NodeC newParent, NotificationChain msgs) @@ -154,7 +149,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setParent(NodeC newParent) @@ -179,7 +173,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -189,7 +182,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -202,7 +194,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeC> getOtherNodes() @@ -217,7 +208,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeC> getOppositeNodes() @@ -232,7 +222,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -257,7 +246,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -279,7 +267,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -295,7 +282,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -319,7 +305,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -352,7 +337,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -381,7 +365,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -405,7 +388,6 @@ public class NodeCImpl extends EObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 f7e23a2673..b7c27aeac6 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 @@ -32,22 +32,22 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getOtherNodes <em>Other Nodes</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getOppositeNode <em>Opposite Node</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl#getOppositeNode <em>Opposite Node</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeDImpl extends EObjectImpl implements NodeD { /** - * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. <!-- begin-user-doc + * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getChildren() * @generated * @ordered @@ -65,8 +65,8 @@ public class NodeDImpl extends EObjectImpl implements NodeD protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -74,9 +74,9 @@ public class NodeDImpl extends EObjectImpl implements NodeD protected String name = NAME_EDEFAULT; /** - * The cached value of the '{@link #getOtherNodes() <em>Other Nodes</em>}' reference list. <!-- begin-user-doc --> + * The cached value of the '{@link #getOtherNodes() <em>Other Nodes</em>}' reference list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getOtherNodes() * @generated * @ordered @@ -84,9 +84,9 @@ public class NodeDImpl extends EObjectImpl implements NodeD protected EList<NodeD> otherNodes; /** - * The cached value of the '{@link #getOppositeNode() <em>Opposite Node</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getOppositeNode() <em>Opposite Node</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getOppositeNode() * @generated * @ordered @@ -95,7 +95,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeDImpl() @@ -105,7 +104,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -116,7 +114,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeD> getChildren() @@ -131,7 +128,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD getParent() @@ -143,7 +139,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetParent(NodeD newParent, NotificationChain msgs) @@ -154,7 +149,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setParent(NodeD newParent) @@ -179,7 +173,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -189,7 +182,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -202,7 +194,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<NodeD> getOtherNodes() @@ -217,7 +208,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD getOppositeNode() @@ -238,7 +228,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD basicGetOppositeNode() @@ -248,7 +237,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetOppositeNode(NodeD newOppositeNode, NotificationChain msgs) @@ -269,7 +257,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setOppositeNode(NodeD newOppositeNode) @@ -294,7 +281,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -322,7 +308,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -344,7 +329,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -360,7 +344,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -386,7 +369,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -418,7 +400,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -447,7 +428,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -471,7 +451,6 @@ public class NodeDImpl extends EObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 5376564972..75eecfd6f2 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 @@ -26,18 +26,18 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl#getPoints <em>Points</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl#getPoints <em>Points</em>}</li> * </ul> * </p> - * + * * @generated */ public class PolygonImpl extends EObjectImpl implements Polygon { /** - * The cached value of the '{@link #getPoints() <em>Points</em>}' attribute list. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getPoints() <em>Points</em>}' attribute list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getPoints() * @generated * @ordered @@ -46,7 +46,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected PolygonImpl() @@ -56,7 +55,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -67,7 +65,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Point> getPoints() @@ -81,7 +78,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -97,7 +93,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -116,7 +111,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -133,7 +127,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -149,7 +142,6 @@ public class PolygonImpl extends EObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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 c9cd567452..1d324b89b0 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 @@ -27,18 +27,18 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl#getPoints <em>Points</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl#getPoints <em>Points</em>}</li> * </ul> * </p> - * + * * @generated */ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWithDuplicates { /** - * The cached value of the '{@link #getPoints() <em>Points</em>}' attribute list. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getPoints() <em>Points</em>}' attribute list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getPoints() * @generated * @ordered @@ -47,7 +47,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected PolygonWithDuplicatesImpl() @@ -57,7 +56,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -68,7 +66,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Point> getPoints() @@ -82,7 +79,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -98,7 +94,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -117,7 +112,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -134,7 +128,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -150,7 +143,6 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java index e6a7d931cf..ef5f2b8390 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackageFactory.java @@ -15,30 +15,29 @@ import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage * @generated */ public interface SubpackageFactory extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory { /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ SubpackageFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackageFactoryImpl.init(); /** - * Returns a new object of class '<em>Class2</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Class2</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Class2</em>'. * @generated */ Class2 createClass2(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java index 7503b82a0b..cbdae4393b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/SubpackagePackage.java @@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory * @model kind="package" * @generated @@ -30,8 +29,8 @@ import org.eclipse.emf.ecore.EReference; public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage { /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "subpackage"; @@ -44,23 +43,22 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/subpackage/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "subpackage"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl - * <em>Class2</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl <em>Class2</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl#getClass2() * @generated @@ -68,25 +66,24 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp int CLASS2 = 0; /** - * The feature id for the '<em><b>Class1</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Class1</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CLASS2__CLASS1 = 0; /** - * The number of structural features of the '<em>Class2</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Class2</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CLASS2_FEATURE_COUNT = 1; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 - * <em>Class2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 <em>Class2</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Class2</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 * @generated @@ -94,10 +91,9 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp EClass getClass2(); /** - * Returns the meta object for the reference list ' - * {@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. <!-- begin-user-doc + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the reference list '<em>Class1</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1() * @see #getClass2() @@ -106,8 +102,8 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp EReference getClass2_Class1(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ @@ -122,15 +118,13 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp * <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.subpackage.impl.Class2Impl - * <em>Class2</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl <em>Class2</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl#getClass2() * @generated @@ -138,9 +132,9 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp EClass CLASS2 = eINSTANCE.getClass2(); /** - * The meta object literal for the '<em><b>Class1</b></em>' reference list feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Class1</b></em>' reference list feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference CLASS2__CLASS1 = eINSTANCE.getClass2_Class1(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java index 93d24147f4..c52363bd73 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/Class2Impl.java @@ -30,18 +30,18 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl#getClass1 <em>Class1</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl#getClass1 <em>Class1</em>}</li> * </ul> * </p> - * + * * @generated */ public class Class2Impl extends EObjectImpl implements Class2 { /** - * The cached value of the '{@link #getClass1() <em>Class1</em>}' reference list. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getClass1() <em>Class1</em>}' reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getClass1() * @generated * @ordered @@ -50,7 +50,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected Class2Impl() @@ -60,7 +59,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -71,7 +69,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Class1> getClass1() @@ -86,7 +83,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -103,7 +99,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -119,7 +114,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -135,7 +129,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -154,7 +147,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -171,7 +163,6 @@ public class Class2Impl extends EObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java index 20dcb79308..ea81fc1017 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackageFactoryImpl.java @@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFactory @@ -51,8 +50,8 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public SubpackageFactoryImpl() @@ -62,7 +61,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -79,7 +77,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Class2 createClass2() @@ -90,7 +87,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SubpackagePackage getSubpackagePackage() @@ -100,7 +96,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java index f1b5cbfd46..fb5eb4fb31 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java @@ -24,14 +24,12 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass class2EClass = null; @@ -56,18 +54,17 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * <p> - * This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed. Clients should - * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc - * --> <!-- end-user-doc --> * + * <p>This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc + * --> <!-- end-user-doc --> * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -110,7 +107,6 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClass2() @@ -120,7 +116,6 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getClass2_Class1() @@ -130,7 +125,6 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SubpackageFactory getSubpackageFactory() @@ -140,15 +134,14 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() @@ -164,15 +157,14 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java index 3b7549386e..ac724ff246 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java @@ -21,22 +21,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage * @generated */ public class SubpackageAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static SubpackagePackage modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public SubpackageAdapterFactory() @@ -48,10 +47,10 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -70,8 +69,8 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>() @@ -90,10 +89,9 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -104,10 +102,9 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 - * <em>Class2</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 <em>Class2</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 * @generated @@ -118,9 +115,9 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java index 653db25dc8..fac74b33c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java @@ -13,32 +13,30 @@ package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util; import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - -import java.util.List; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.util.Switch; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage * @generated */ -public class SubpackageSwitch<T> +public class SubpackageSwitch<T> extends Switch<T> { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static SubpackagePackage modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public SubpackageSwitch() @@ -50,44 +48,26 @@ public class SubpackageSwitch<T> } /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. + * Checks whether this is a switch for the given package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @parameter ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -106,11 +86,10 @@ public class SubpackageSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Class2</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Class2</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Class2</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -121,16 +100,16 @@ public class SubpackageSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java index 0765f2e126..9f53576308 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests.legacy.model3.util; import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -30,22 +31,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package * @generated */ public class Model3AdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static Model3Package modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model3AdapterFactory() @@ -57,10 +57,10 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -79,8 +79,8 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected Model3Switch<Adapter> modelSwitch = new Model3Switch<Adapter>() @@ -146,6 +146,12 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } @Override + public Adapter caseClassWithIDAttribute(ClassWithIDAttribute object) + { + return createClassWithIDAttributeAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -153,10 +159,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -167,10 +172,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1 - * <em>Class1</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1 <em>Class1</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1 * @generated @@ -181,10 +185,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef - * <em>Meta Ref</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef <em>Meta Ref</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef * @generated @@ -195,10 +198,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Polygon - * <em>Polygon</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Polygon <em>Polygon</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.Polygon * @generated @@ -209,11 +211,10 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates - * <em>Polygon With Duplicates</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates <em>Polygon With Duplicates</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates * @generated @@ -224,10 +225,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA <em>Node A</em>} - * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA <em>Node A</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeA * @generated @@ -238,10 +238,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB <em>Node B</em>} - * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB <em>Node B</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeB * @generated @@ -252,10 +251,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC <em>Node C</em>} - * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC <em>Node C</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeC * @generated @@ -266,10 +264,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD <em>Node D</em>} - * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD <em>Node D</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD * @generated @@ -280,10 +277,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image <em>Image</em>} - * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image <em>Image</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.Image * @generated @@ -297,7 +293,6 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.File <em>File</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.legacy.model3.File * @generated @@ -308,9 +303,24 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute <em>Class With ID Attribute</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute + * @generated + */ + public Adapter createClassWithIDAttributeAdapter() + { + return null; + } + + /** + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java index 5b38783509..911294109a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests.legacy.model3.util; import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -22,32 +23,30 @@ import org.eclipse.emf.cdo.tests.model3.NodeD; import org.eclipse.emf.cdo.tests.model3.Polygon; import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - -import java.util.List; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.util.Switch; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Package * @generated */ -public class Model3Switch<T> +public class Model3Switch<T> extends Switch<T> { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static Model3Package modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model3Switch() @@ -59,44 +58,26 @@ public class Model3Switch<T> } /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public T doSwitch(EObject theEObject) - { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. + * Checks whether this is a switch for the given package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @parameter ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - protected T doSwitch(EClass theEClass, EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -181,17 +162,24 @@ public class Model3Switch<T> result = defaultCase(theEObject); return result; } + case Model3Package.CLASS_WITH_ID_ATTRIBUTE: + { + ClassWithIDAttribute classWithIDAttribute = (ClassWithIDAttribute)theEObject; + T result = caseClassWithIDAttribute(classWithIDAttribute); + if (result == null) + result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } /** - * Returns the result of interpreting the object as an instance of '<em>Class1</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Class1</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Class1</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -202,11 +190,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Meta Ref</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Meta Ref</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Meta Ref</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -217,11 +204,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Polygon</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Polygon</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Polygon</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -248,11 +234,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node A</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node A</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node A</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -263,11 +248,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node B</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node B</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node B</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -278,11 +262,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node C</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node C</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node C</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -293,11 +276,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node D</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node D</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node D</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -308,11 +290,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Image</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Image</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Image</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -323,11 +304,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>File</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>File</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>File</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -338,16 +318,32 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClassWithIDAttribute(ClassWithIDAttribute object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java index 3e1906cdcd..e7339b1cb8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java @@ -17,13 +17,14 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Class1</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1() * @model * @generated @@ -31,15 +32,15 @@ import org.eclipse.emf.ecore.EObject; public interface Class1 extends EObject { /** - * Returns the value of the '<em><b>Class2</b></em>' reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Class2</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Class2</em>' reference list isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Class2</em>' reference list. * @see #isSetClass2() * @see #unsetClass2() @@ -53,7 +54,6 @@ public interface Class1 extends EObject /** * Unsets the value of the '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}' reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see #isSetClass2() * @see #getClass2() * @generated @@ -61,9 +61,8 @@ public interface Class1 extends EObject void unsetClass2(); /** - * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}' - * reference list is set. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns whether the value of the '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}' reference list is set. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return whether the value of the '<em>Class2</em>' reference list is set. * @see #unsetClass2() * @see #getClass2() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java new file mode 100644 index 0000000000..9188684c62 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithIDAttribute.java @@ -0,0 +1,59 @@ +/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model3;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Class With ID Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute#getId <em>Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithIDAttribute()
+ * @model
+ * @generated
+ */
+public interface ClassWithIDAttribute extends EObject
+{
+ /**
+ * Returns the value of the '<em><b>Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Id</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Id</em>' attribute.
+ * @see #setId(String)
+ * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithIDAttribute_Id()
+ * @model id="true"
+ * @generated
+ */
+ String getId();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute#getId <em>Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Id</em>' attribute.
+ * @see #getId()
+ * @generated
+ */
+ void setId(String value);
+
+} // ClassWithIDAttribute
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java index 21a728a7e3..87045f5fd2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/File.java @@ -16,14 +16,15 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>File</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.File#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.File#getData <em>Data</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.File#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.File#getData <em>Data</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile() * @model * @generated @@ -31,12 +32,12 @@ import org.eclipse.emf.ecore.EObject; public interface File extends EObject { /** - * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile_Name() @@ -57,12 +58,12 @@ public interface File extends EObject void setName(String value); /** - * Returns the value of the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Data</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Data</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Data</em>' attribute. * @see #setData(CDOClob) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile_Data() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java index 72ac62c34f..07549652e2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Image.java @@ -16,15 +16,16 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Image</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.Image#getWidth <em>Width</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.Image#getHeight <em>Height</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.Image#getData <em>Data</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.Image#getWidth <em>Width</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.Image#getHeight <em>Height</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.Image#getData <em>Data</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage() * @model * @generated @@ -32,12 +33,12 @@ import org.eclipse.emf.ecore.EObject; public interface Image extends EObject { /** - * Returns the value of the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Width</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Width</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Width</em>' attribute. * @see #setWidth(int) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage_Width() @@ -58,12 +59,12 @@ public interface Image extends EObject void setWidth(int value); /** - * Returns the value of the '<em><b>Height</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Height</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Height</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Height</em>' attribute. * @see #setHeight(int) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage_Height() @@ -84,12 +85,12 @@ public interface Image extends EObject void setHeight(int value); /** - * Returns the value of the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Data</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Data</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Data</em>' attribute. * @see #setData(CDOBlob) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage_Data() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java index d937990089..ef1e6d5816 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java @@ -53,13 +53,13 @@ public interface MetaRef extends EObject void setEPackageRef(EPackage value); /** - * Returns the value of the '<em><b>EClass Ref</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>EClass Ref</b></em>' reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>EClass Ref</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>EClass Ref</em>' reference. * @see #setEClassRef(EClass) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getMetaRef_EClassRef() @@ -69,24 +69,22 @@ public interface MetaRef extends EObject EClass getEClassRef(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEClassRef <em>EClass Ref</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>EClass Ref</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEClassRef <em>EClass Ref</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>EClass Ref</em>' reference. * @see #getEClassRef() * @generated */ void setEClassRef(EClass value); /** - * Returns the value of the '<em><b>EReference Ref</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>EReference Ref</b></em>' reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>EReference Ref</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>EReference Ref</em>' reference. * @see #setEReferenceRef(EReference) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getMetaRef_EReferenceRef() @@ -96,11 +94,9 @@ public interface MetaRef extends EObject EReference getEReferenceRef(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEReferenceRef <em>EReference Ref</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>EReference Ref</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEReferenceRef <em>EReference Ref</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>EReference Ref</em>' reference. * @see #getEReferenceRef() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java index 83de00da63..2e6025a17d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java @@ -15,102 +15,110 @@ import org.eclipse.emf.ecore.EFactory; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.Model3Package * @generated */ public interface Model3Factory extends EFactory { /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model3Factory eINSTANCE = org.eclipse.emf.cdo.tests.model3.impl.Model3FactoryImpl.init(); /** - * Returns a new object of class '<em>Class1</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Class1</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Class1</em>'. * @generated */ Class1 createClass1(); /** - * Returns a new object of class '<em>Meta Ref</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Meta Ref</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Meta Ref</em>'. * @generated */ MetaRef createMetaRef(); /** - * Returns a new object of class '<em>Polygon</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Polygon</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Polygon</em>'. * @generated */ Polygon createPolygon(); /** - * Returns a new object of class '<em>Polygon With Duplicates</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Polygon With Duplicates</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Polygon With Duplicates</em>'. * @generated */ PolygonWithDuplicates createPolygonWithDuplicates(); /** - * Returns a new object of class '<em>Node A</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node A</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node A</em>'. * @generated */ NodeA createNodeA(); /** - * Returns a new object of class '<em>Node B</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node B</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node B</em>'. * @generated */ NodeB createNodeB(); /** - * Returns a new object of class '<em>Node C</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node C</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node C</em>'. * @generated */ NodeC createNodeC(); /** - * Returns a new object of class '<em>Node D</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Node D</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Node D</em>'. * @generated */ NodeD createNodeD(); /** - * Returns a new object of class '<em>Image</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Image</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Image</em>'. * @generated */ Image createImage(); /** - * Returns a new object of class '<em>File</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>File</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>File</em>'. * @generated */ File createFile(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Class With ID Attribute</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Class With ID Attribute</em>'. + * @generated + */ + ClassWithIDAttribute createClassWithIDAttribute(); + + /** + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.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 17e8b1751f..4c10ccd892 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 @@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.Model3Factory * @model kind="package" * @generated @@ -33,29 +32,29 @@ import org.eclipse.emf.ecore.EReference; public interface Model3Package extends EPackage { /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "model3"; /** - * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace URI. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model3/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "model3"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl.init(); @@ -71,16 +70,16 @@ public interface Model3Package extends EPackage int CLASS1 = 0; /** - * The feature id for the '<em><b>Class2</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Class2</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CLASS1__CLASS2 = 0; /** - * The number of structural features of the '<em>Class1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Class1</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -89,7 +88,6 @@ public interface Model3Package extends EPackage /** * The meta object id 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 @@ -97,32 +95,32 @@ public interface Model3Package extends EPackage int META_REF = 1; /** - * The feature id for the '<em><b>EPackage Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>EPackage Ref</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF__EPACKAGE_REF = 0; /** - * The feature id for the '<em><b>EClass Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>EClass Ref</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF__ECLASS_REF = 1; /** - * The feature id for the '<em><b>EReference Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>EReference Ref</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int META_REF__EREFERENCE_REF = 2; /** - * The number of structural features of the '<em>Meta Ref</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Meta Ref</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -139,25 +137,24 @@ public interface Model3Package extends EPackage int POLYGON = 2; /** - * The feature id for the '<em><b>Points</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Points</b></em>' attribute list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int POLYGON__POINTS = 0; /** - * The number of structural features of the '<em>Polygon</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Polygon</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int POLYGON_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl - * <em>Polygon With Duplicates</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id 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 @@ -165,17 +162,17 @@ public interface Model3Package extends EPackage int POLYGON_WITH_DUPLICATES = 3; /** - * The feature id for the '<em><b>Points</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Points</b></em>' attribute list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int POLYGON_WITH_DUPLICATES__POINTS = 0; /** - * The number of structural features of the '<em>Polygon With Duplicates</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Polygon With Duplicates</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ @@ -192,33 +189,33 @@ public interface Model3Package extends EPackage int NODE_A = 4; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_A__CHILDREN = 0; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_A__NAME = 1; /** - * The feature id for the '<em><b>Other Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Other Nodes</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_A__OTHER_NODES = 2; /** - * The number of structural features of the '<em>Node A</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node A</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -235,33 +232,33 @@ public interface Model3Package extends EPackage int NODE_B = 5; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_B__CHILDREN = 0; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Parent</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_B__PARENT = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_B__NAME = 2; /** - * The number of structural features of the '<em>Node B</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node B</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -278,33 +275,33 @@ public interface Model3Package extends EPackage int NODE_C = 6; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_C__CHILDREN = 0; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Parent</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_C__PARENT = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_C__NAME = 2; /** - * The feature id for the '<em><b>Other Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Other Nodes</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -320,8 +317,8 @@ public interface Model3Package extends EPackage int NODE_C__OPPOSITE_NODES = 4; /** - * The number of structural features of the '<em>Node C</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node C</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -338,49 +335,49 @@ public interface Model3Package extends EPackage int NODE_D = 7; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Children</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int NODE_D__CHILDREN = 0; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Parent</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__PARENT = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__NAME = 2; /** - * The feature id for the '<em><b>Other Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Other Nodes</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__OTHER_NODES = 3; /** - * The feature id for the '<em><b>Opposite Node</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Opposite Node</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int NODE_D__OPPOSITE_NODE = 4; /** - * The number of structural features of the '<em>Node D</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Node D</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -397,32 +394,32 @@ public interface Model3Package extends EPackage int IMAGE = 8; /** - * The feature id for the '<em><b>Width</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Width</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int IMAGE__WIDTH = 0; /** - * The feature id for the '<em><b>Height</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Height</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int IMAGE__HEIGHT = 1; /** - * The feature id for the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Data</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int IMAGE__DATA = 2; /** - * The number of structural features of the '<em>Image</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Image</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -439,37 +436,65 @@ public interface Model3Package extends EPackage int FILE = 9; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int FILE__NAME = 0; /** - * The feature id for the '<em><b>Data</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Data</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int FILE__DATA = 1; /** - * The number of structural features of the '<em>File</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>File</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int FILE_FEATURE_COUNT = 2; /** - * The meta object id for the '<em>Point</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithIDAttributeImpl <em>Class With ID Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.impl.ClassWithIDAttributeImpl + * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClassWithIDAttribute() + * @generated + */ + int CLASS_WITH_ID_ATTRIBUTE = 10; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_ID_ATTRIBUTE__ID = 0; + + /** + * The number of structural features of the '<em>Class With ID Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_ID_ATTRIBUTE_FEATURE_COUNT = 1; + + /** + * The meta object id 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 */ - int POINT = 10; + int POINT = 11; /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Class1 <em>Class1</em>}'. <!-- @@ -482,9 +507,8 @@ public interface Model3Package extends EPackage EClass getClass1(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 - * <em>Class2</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Class2</em>'. * @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2() * @see #getClass1() @@ -503,9 +527,8 @@ public interface Model3Package extends EPackage EClass getMetaRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef - * <em>EPackage Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef <em>EPackage Ref</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>EPackage Ref</em>'. * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef() * @see #getMetaRef() @@ -514,9 +537,8 @@ public interface Model3Package extends EPackage EReference getMetaRef_EPackageRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEClassRef - * <em>EClass Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEClassRef <em>EClass Ref</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>EClass Ref</em>'. * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEClassRef() * @see #getMetaRef() @@ -525,9 +547,8 @@ public interface Model3Package extends EPackage EReference getMetaRef_EClassRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEReferenceRef - * <em>EReference Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEReferenceRef <em>EReference Ref</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>EReference Ref</em>'. * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEReferenceRef() * @see #getMetaRef() @@ -546,9 +567,8 @@ public interface Model3Package extends EPackage EClass getPolygon(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model3.Polygon#getPoints - * <em>Points</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model3.Polygon#getPoints <em>Points</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Points</em>'. * @see org.eclipse.emf.cdo.tests.model3.Polygon#getPoints() * @see #getPolygon() @@ -557,9 +577,8 @@ public interface Model3Package extends EPackage EAttribute getPolygon_Points(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates - * <em>Polygon With Duplicates</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates <em>Polygon With Duplicates</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Polygon With Duplicates</em>'. * @see org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates * @generated @@ -567,10 +586,9 @@ public interface Model3Package extends EPackage EClass getPolygonWithDuplicates(); /** - * Returns the meta object for the attribute list ' - * {@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates#getPoints <em>Points</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates#getPoints <em>Points</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the attribute list '<em>Points</em>'. * @see org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates#getPoints() * @see #getPolygonWithDuplicates() @@ -589,10 +607,9 @@ public interface Model3Package extends EPackage EClass getNodeA(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeA#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeA#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeA#getChildren() * @see #getNodeA() @@ -603,7 +620,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.NodeA#getName <em>Name</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeA#getName() * @see #getNodeA() @@ -612,9 +628,8 @@ public interface Model3Package extends EPackage EAttribute getNodeA_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeA#getOtherNodes - * <em>Other Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeA#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Other Nodes</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeA#getOtherNodes() * @see #getNodeA() @@ -633,10 +648,9 @@ public interface Model3Package extends EPackage EClass getNodeB(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeB#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeB#getChildren() * @see #getNodeB() @@ -645,9 +659,8 @@ public interface Model3Package extends EPackage EReference getNodeB_Children(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent - * <em>Parent</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the container reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeB#getParent() * @see #getNodeB() @@ -658,7 +671,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getName <em>Name</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeB#getName() * @see #getNodeB() @@ -677,10 +689,9 @@ public interface Model3Package extends EPackage EClass getNodeC(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeC#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeC#getChildren() * @see #getNodeC() @@ -689,9 +700,8 @@ public interface Model3Package extends EPackage EReference getNodeC_Children(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent - * <em>Parent</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the container reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeC#getParent() * @see #getNodeC() @@ -702,7 +712,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getName <em>Name</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeC#getName() * @see #getNodeC() @@ -711,9 +720,8 @@ public interface Model3Package extends EPackage EAttribute getNodeC_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes - * <em>Other Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Other Nodes</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes() * @see #getNodeC() @@ -722,9 +730,8 @@ public interface Model3Package extends EPackage EReference getNodeC_OtherNodes(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes - * <em>Opposite Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes <em>Opposite Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Opposite Nodes</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes() * @see #getNodeC() @@ -743,10 +750,9 @@ public interface Model3Package extends EPackage EClass getNodeD(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeD#getChildren <em>Children</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Children</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeD#getChildren() * @see #getNodeD() @@ -755,9 +761,8 @@ public interface Model3Package extends EPackage EReference getNodeD_Children(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent - * <em>Parent</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the container reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeD#getParent() * @see #getNodeD() @@ -768,7 +773,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getName <em>Name</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeD#getName() * @see #getNodeD() @@ -777,9 +781,8 @@ public interface Model3Package extends EPackage EAttribute getNodeD_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes - * <em>Other Nodes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Other Nodes</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes() * @see #getNodeD() @@ -788,9 +791,8 @@ public interface Model3Package extends EPackage EReference getNodeD_OtherNodes(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode - * <em>Opposite Node</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Opposite Node</em>'. * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode() * @see #getNodeD() @@ -811,7 +813,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.Image#getWidth <em>Width</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Width</em>'. * @see org.eclipse.emf.cdo.tests.model3.Image#getWidth() * @see #getImage() @@ -820,9 +821,8 @@ public interface Model3Package extends EPackage EAttribute getImage_Width(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.Image#getHeight <em>Height</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.Image#getHeight <em>Height</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Height</em>'. * @see org.eclipse.emf.cdo.tests.model3.Image#getHeight() * @see #getImage() @@ -833,7 +833,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.Image#getData <em>Data</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Data</em>'. * @see org.eclipse.emf.cdo.tests.model3.Image#getData() * @see #getImage() @@ -854,7 +853,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.File#getName <em>Name</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model3.File#getName() * @see #getFile() @@ -865,7 +863,6 @@ public interface Model3Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.File#getData <em>Data</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Data</em>'. * @see org.eclipse.emf.cdo.tests.model3.File#getData() * @see #getFile() @@ -874,6 +871,27 @@ public interface Model3Package extends EPackage EAttribute getFile_Data(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute <em>Class With ID Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Class With ID Attribute</em>'. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute + * @generated + */ + EClass getClassWithIDAttribute(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute#getId <em>Id</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute#getId() + * @see #getClassWithIDAttribute() + * @generated + */ + EAttribute getClassWithIDAttribute_Id(); + + /** * Returns the meta object for data type '{@link org.eclipse.emf.cdo.tests.model3.Point <em>Point</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -885,8 +903,8 @@ public interface Model3Package extends EPackage EDataType getPoint(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java index 39b20658a1..cdefd76c5c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeA.java @@ -15,15 +15,16 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Node A</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeA#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeA#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeA#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeA#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeA#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeA#getOtherNodes <em>Other Nodes</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA() * @model * @generated @@ -31,14 +32,14 @@ import org.eclipse.emf.ecore.EObject; public interface NodeA extends EObject { /** - * Returns the value of the '<em><b>Children</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeA}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Children</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeA}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Children</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA_Children() * @model containment="true" @@ -47,12 +48,12 @@ public interface NodeA extends EObject EList<NodeA> getChildren(); /** - * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA_Name() @@ -73,14 +74,14 @@ public interface NodeA extends EObject void setName(String value); /** - * Returns the value of the '<em><b>Other Nodes</b></em>' reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeA}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Other Nodes</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeA}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Other Nodes</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Other Nodes</em>' reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA_OtherNodes() * @model diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java index 86837698a4..9fb7fd33cd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeB.java @@ -15,15 +15,16 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Node B</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeB#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeB#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeB#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeB#getName <em>Name</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB() * @model * @generated @@ -31,15 +32,15 @@ import org.eclipse.emf.ecore.EObject; public interface NodeB extends EObject { /** - * Returns the value of the '<em><b>Children</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeB}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Children</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeB}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Children</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB_Children() * @see org.eclipse.emf.cdo.tests.model3.NodeB#getParent @@ -49,14 +50,14 @@ public interface NodeB extends EObject EList<NodeB> getChildren(); /** - * Returns the value of the '<em><b>Parent</b></em>' container reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeB#getChildren <em>Children</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Parent</b></em>' container reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Parent</em>' container reference. * @see #setParent(NodeB) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB_Parent() @@ -67,23 +68,21 @@ public interface NodeB extends EObject NodeB getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}' container - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Parent</em>' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeB#getParent <em>Parent</em>}' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Parent</em>' container reference. * @see #getParent() * @generated */ void setParent(NodeB value); /** - * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB_Name() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java index 337d932a62..999d160344 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeC.java @@ -15,17 +15,18 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Node C</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes <em>Other Nodes</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes <em>Opposite Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes <em>Opposite Nodes</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC() * @model * @generated @@ -33,15 +34,15 @@ import org.eclipse.emf.ecore.EObject; public interface NodeC extends EObject { /** - * Returns the value of the '<em><b>Children</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeC}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Children</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeC}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Children</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_Children() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getParent @@ -51,14 +52,14 @@ public interface NodeC extends EObject EList<NodeC> getChildren(); /** - * Returns the value of the '<em><b>Parent</b></em>' container reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeC#getChildren <em>Children</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Parent</b></em>' container reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Parent</em>' container reference. * @see #setParent(NodeC) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_Parent() @@ -69,23 +70,21 @@ public interface NodeC extends EObject NodeC getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}' container - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Parent</em>' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getParent <em>Parent</em>}' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Parent</em>' container reference. * @see #getParent() * @generated */ void setParent(NodeC value); /** - * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_Name() @@ -106,15 +105,15 @@ public interface NodeC extends EObject void setName(String value); /** - * Returns the value of the '<em><b>Other Nodes</b></em>' reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeC}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes <em>Opposite Nodes</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Other Nodes</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeC}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes <em>Opposite Nodes</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Other Nodes</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Other Nodes</em>' reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_OtherNodes() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes @@ -124,15 +123,15 @@ public interface NodeC extends EObject EList<NodeC> getOtherNodes(); /** - * Returns the value of the '<em><b>Opposite Nodes</b></em>' reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeC}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes <em>Other Nodes</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Opposite Nodes</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeC}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Opposite Nodes</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Opposite Nodes</em>' reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC_OppositeNodes() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java index 60b187eb1e..7ffc3a260a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeD.java @@ -15,17 +15,18 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Node D</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes <em>Other Nodes</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD() * @model * @generated @@ -33,15 +34,15 @@ import org.eclipse.emf.ecore.EObject; public interface NodeD extends EObject { /** - * Returns the value of the '<em><b>Children</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeD}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Children</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeD}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Children</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Children</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_Children() * @see org.eclipse.emf.cdo.tests.model3.NodeD#getParent @@ -51,14 +52,14 @@ public interface NodeD extends EObject EList<NodeD> getChildren(); /** - * Returns the value of the '<em><b>Parent</b></em>' container reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeD#getChildren <em>Children</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Parent</b></em>' container reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getChildren <em>Children</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Parent</em>' container reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Parent</em>' container reference. * @see #setParent(NodeD) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_Parent() @@ -69,23 +70,21 @@ public interface NodeD extends EObject NodeD getParent(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}' container - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Parent</em>' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getParent <em>Parent</em>}' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Parent</em>' container reference. * @see #getParent() * @generated */ void setParent(NodeD value); /** - * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_Name() @@ -106,15 +105,15 @@ public interface NodeD extends EObject void setName(String value); /** - * Returns the value of the '<em><b>Other Nodes</b></em>' reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.NodeD}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Other Nodes</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.NodeD}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Other Nodes</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Other Nodes</em>' reference list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_OtherNodes() * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode @@ -124,14 +123,14 @@ public interface NodeD extends EObject EList<NodeD> getOtherNodes(); /** - * Returns the value of the '<em><b>Opposite Node</b></em>' reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes <em>Other Nodes</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Opposite Node</b></em>' reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes <em>Other Nodes</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Opposite Node</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Opposite Node</em>' reference. * @see #setOppositeNode(NodeD) * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD_OppositeNode() @@ -142,11 +141,9 @@ public interface NodeD extends EObject NodeD getOppositeNode(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Opposite Node</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode <em>Opposite Node</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Opposite Node</em>' reference. * @see #getOppositeNode() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java index 9caf50b53f..962bcddaa7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Polygon.java @@ -15,13 +15,14 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Polygon</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.Polygon#getPoints <em>Points</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.Polygon#getPoints <em>Points</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygon() * @model * @generated @@ -29,14 +30,14 @@ import org.eclipse.emf.ecore.EObject; public interface Polygon extends EObject { /** - * Returns the value of the '<em><b>Points</b></em>' attribute list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.Point}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Points</b></em>' attribute list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.Point}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Points</em>' attribute list isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Points</em>' attribute list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygon_Points() * @model dataType="org.eclipse.emf.cdo.tests.model3.Point" required="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java index 37045f1c8c..6ff94ebcbc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/PolygonWithDuplicates.java @@ -16,13 +16,14 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Polygon With Duplicates</b></em>'. <!-- * end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates#getPoints <em>Points</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates#getPoints <em>Points</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygonWithDuplicates() * @model * @generated @@ -30,14 +31,14 @@ import org.eclipse.emf.ecore.EObject; public interface PolygonWithDuplicates extends EObject { /** - * Returns the value of the '<em><b>Points</b></em>' attribute list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.Point}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Points</b></em>' attribute list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.Point}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Points</em>' attribute list isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Points</em>' attribute list. * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygonWithDuplicates_Points() * @model unique="false" dataType="org.eclipse.emf.cdo.tests.model3.Point" required="true" 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 09aeffa81c..927f20d97b 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 @@ -24,17 +24,16 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl#getClass2 <em>Class2</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl#getClass2 <em>Class2</em>}</li> * </ul> * </p> - * + * * @generated */ public class Class1Impl extends CDOObjectImpl implements Class1 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected Class1Impl() @@ -44,7 +43,6 @@ public class Class1Impl extends CDOObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -55,7 +53,6 @@ public class Class1Impl extends CDOObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class Class1Impl extends CDOObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -77,7 +73,6 @@ public class Class1Impl extends CDOObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void unsetClass2() @@ -87,7 +82,6 @@ public class Class1Impl extends CDOObjectImpl implements Class1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isSetClass2() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java new file mode 100644 index 0000000000..f22c98fd74 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithIDAttributeImpl.java @@ -0,0 +1,87 @@ +/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model3.impl;
+
+import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute;
+import org.eclipse.emf.cdo.tests.model3.Model3Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Class With ID Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithIDAttributeImpl#getId <em>Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ClassWithIDAttributeImpl extends CDOObjectImpl implements ClassWithIDAttribute
+{
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ClassWithIDAttributeImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return Model3Package.eINSTANCE.getClassWithIDAttribute();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected int eStaticFeatureCount()
+ {
+ return 0;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getId()
+ {
+ return (String)eGet(Model3Package.eINSTANCE.getClassWithIDAttribute_Id(), true);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setId(String newId)
+ {
+ eSet(Model3Package.eINSTANCE.getClassWithIDAttribute_Id(), newId);
+ }
+
+} //ClassWithIDAttributeImpl
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 c5911defb3..0a127e5c25 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 @@ -23,18 +23,17 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl#getData <em>Data</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl#getData <em>Data</em>}</li> * </ul> * </p> - * + * * @generated */ public class FileImpl extends CDOObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected FileImpl() @@ -44,7 +43,6 @@ public class FileImpl extends CDOObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -55,7 +53,6 @@ public class FileImpl extends CDOObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class FileImpl extends CDOObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -76,7 +72,6 @@ public class FileImpl extends CDOObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -86,7 +81,6 @@ public class FileImpl extends CDOObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOClob getData() @@ -96,7 +90,6 @@ public class FileImpl extends CDOObjectImpl implements File /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setData(CDOClob newData) 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 9d69f20cd2..3d2f7e8f82 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 @@ -23,19 +23,18 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl#getWidth <em>Width</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl#getHeight <em>Height</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl#getData <em>Data</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl#getWidth <em>Width</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl#getHeight <em>Height</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl#getData <em>Data</em>}</li> * </ul> * </p> - * + * * @generated */ public class ImageImpl extends CDOObjectImpl implements Image { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected ImageImpl() @@ -45,7 +44,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -56,7 +54,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -67,7 +64,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getWidth() @@ -77,7 +73,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setWidth(int newWidth) @@ -87,7 +82,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getHeight() @@ -97,7 +91,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setHeight(int newHeight) @@ -107,7 +100,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOBlob getData() @@ -117,7 +109,6 @@ public class ImageImpl extends CDOObjectImpl implements Image /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setData(CDOBlob newData) 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 94cb7292da..0bbd93838e 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 @@ -35,7 +35,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected MetaRefImpl() @@ -45,7 +44,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -56,7 +54,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -67,7 +64,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EPackage getEPackageRef() @@ -77,7 +73,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setEPackageRef(EPackage newEPackageRef) @@ -87,7 +82,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getEClassRef() @@ -97,7 +91,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setEClassRef(EClass newEClassRef) @@ -107,7 +100,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getEReferenceRef() @@ -117,7 +109,6 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setEReferenceRef(EReference newEReferenceRef) diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java index 63f5b472b7..cccebd286a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.tests.model3.impl; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -33,14 +34,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory { /** - * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the default factory implementation. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static Model3Factory init() @@ -62,8 +62,8 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model3FactoryImpl() @@ -73,7 +73,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -101,6 +100,8 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory return createImage(); case Model3Package.FILE: return createFile(); + case Model3Package.CLASS_WITH_ID_ATTRIBUTE: + return createClassWithIDAttribute(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -108,7 +109,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -125,7 +125,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -142,7 +141,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Class1 createClass1() @@ -153,7 +151,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public MetaRef createMetaRef() @@ -164,7 +161,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Polygon createPolygon() @@ -175,7 +171,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public PolygonWithDuplicates createPolygonWithDuplicates() @@ -186,7 +181,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeA createNodeA() @@ -197,7 +191,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeB createNodeB() @@ -208,7 +201,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeC createNodeC() @@ -219,7 +211,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD createNodeD() @@ -230,7 +221,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Image createImage() @@ -241,7 +231,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public File createFile() @@ -251,6 +240,17 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ClassWithIDAttribute createClassWithIDAttribute() + { + ClassWithIDAttributeImpl classWithIDAttribute = new ClassWithIDAttributeImpl(); + return classWithIDAttribute; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated NOT @@ -272,7 +272,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Package getModel3Package() @@ -282,7 +281,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java index cfc8065930..aa3a1c5957 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests.model3.impl; import org.eclipse.emf.cdo.etypes.EtypesPackage; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -37,84 +38,79 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class Model3PackageImpl extends EPackageImpl implements Model3Package { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass class1EClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass metaRefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass polygonEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass polygonWithDuplicatesEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeAEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeBEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeCEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass nodeDEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass imageEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass fileEClass = null; /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass classWithIDAttributeEClass = null; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType pointEDataType = null; @@ -139,18 +135,17 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * <p> - * This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed. Clients should not - * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> - * <!-- end-user-doc --> * + * <p>This method is used to initialize {@link Model3Package#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -193,7 +188,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClass1() @@ -203,7 +197,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getClass1_Class2() @@ -213,7 +206,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getMetaRef() @@ -223,7 +215,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EPackageRef() @@ -233,7 +224,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EClassRef() @@ -243,7 +233,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EReferenceRef() @@ -253,7 +242,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygon() @@ -263,7 +251,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygon_Points() @@ -273,7 +260,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygonWithDuplicates() @@ -283,7 +269,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygonWithDuplicates_Points() @@ -293,7 +278,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeA() @@ -303,7 +287,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_Children() @@ -313,7 +296,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeA_Name() @@ -323,7 +305,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_OtherNodes() @@ -333,7 +314,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeB() @@ -343,7 +323,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Children() @@ -353,7 +332,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Parent() @@ -363,7 +341,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeB_Name() @@ -373,7 +350,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeC() @@ -383,7 +359,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Children() @@ -393,7 +368,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Parent() @@ -403,7 +377,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeC_Name() @@ -413,7 +386,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OtherNodes() @@ -423,7 +395,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OppositeNodes() @@ -433,7 +404,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeD() @@ -443,7 +413,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Children() @@ -453,7 +422,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Parent() @@ -463,7 +431,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeD_Name() @@ -473,7 +440,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OtherNodes() @@ -483,7 +449,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OppositeNode() @@ -493,7 +458,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getImage() @@ -503,7 +467,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Width() @@ -513,7 +476,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Height() @@ -523,7 +485,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Data() @@ -533,7 +494,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getFile() @@ -543,7 +503,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Name() @@ -553,7 +512,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Data() @@ -562,8 +520,27 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getClassWithIDAttribute() + { + return classWithIDAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClassWithIDAttribute_Id() + { + return (EAttribute)classWithIDAttributeEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getPoint() @@ -573,7 +550,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Factory getModel3Factory() @@ -583,15 +559,14 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() @@ -648,21 +623,23 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package createEAttribute(fileEClass, FILE__NAME); createEAttribute(fileEClass, FILE__DATA); + classWithIDAttributeEClass = createEClass(CLASS_WITH_ID_ATTRIBUTE); + createEAttribute(classWithIDAttributeEClass, CLASS_WITH_ID_ATTRIBUTE__ID); + // Create data types pointEDataType = createEDataType(POINT); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() @@ -784,6 +761,12 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package initEAttribute(getFile_Data(), theEtypesPackage.getClob(), "data", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(classWithIDAttributeEClass, ClassWithIDAttribute.class, "ClassWithIDAttribute", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getClassWithIDAttribute_Id(), theEcorePackage.getEString(), "id", null, 0, 1, + ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + // Initialize data types initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); 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 5b0c704299..0b4acd8403 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 @@ -23,19 +23,18 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl#getOtherNodes <em>Other Nodes</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeAImpl extends CDOObjectImpl implements NodeA { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeAImpl() @@ -45,7 +44,6 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -56,7 +54,6 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -67,7 +64,6 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -78,7 +74,6 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -88,7 +83,6 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -98,7 +92,6 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 9d29799ecb..441ecf3c63 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 @@ -23,19 +23,18 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl#getName <em>Name</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeBImpl extends CDOObjectImpl implements NodeB { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeBImpl() @@ -45,7 +44,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -56,7 +54,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -67,7 +64,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -78,7 +74,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeB getParent() @@ -88,7 +83,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setParent(NodeB newParent) @@ -98,7 +92,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -108,7 +101,6 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) 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 20a2176fcd..8910f52e4e 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 @@ -23,21 +23,20 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getOtherNodes <em>Other Nodes</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getOppositeNodes <em>Opposite Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl#getOppositeNodes <em>Opposite Nodes</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeCImpl extends CDOObjectImpl implements NodeC { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeCImpl() @@ -47,7 +46,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -58,7 +56,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -69,7 +66,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -80,7 +76,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeC getParent() @@ -90,7 +85,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setParent(NodeC newParent) @@ -100,7 +94,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -110,7 +103,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -120,7 +112,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -131,7 +122,6 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 4645c77171..58a643e5e3 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 @@ -23,21 +23,20 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getChildren <em>Children</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getParent <em>Parent</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getOtherNodes <em>Other Nodes</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getOppositeNode <em>Opposite Node</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl#getOppositeNode <em>Opposite Node</em>}</li> * </ul> * </p> - * + * * @generated */ public class NodeDImpl extends CDOObjectImpl implements NodeD { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected NodeDImpl() @@ -47,7 +46,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -58,7 +56,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -69,7 +66,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -80,7 +76,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD getParent() @@ -90,7 +85,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setParent(NodeD newParent) @@ -100,7 +94,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -110,7 +103,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -120,7 +112,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -131,7 +122,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD getOppositeNode() @@ -141,7 +131,6 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setOppositeNode(NodeD newOppositeNode) 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 23c36bb064..0a6a3cc317 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 @@ -24,17 +24,16 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl#getPoints <em>Points</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl#getPoints <em>Points</em>}</li> * </ul> * </p> - * + * * @generated */ public class PolygonImpl extends CDOObjectImpl implements Polygon { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected PolygonImpl() @@ -44,7 +43,6 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -55,7 +53,6 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 69f82a5a4f..2c76e2ecd8 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 @@ -25,17 +25,16 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl#getPoints <em>Points</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl#getPoints <em>Points</em>}</li> * </ul> * </p> - * + * * @generated */ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonWithDuplicates { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected PolygonWithDuplicatesImpl() @@ -45,7 +44,6 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -56,7 +54,6 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -67,7 +64,6 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java index 975ed491c5..fdc5dd31ca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/Class2.java @@ -17,13 +17,14 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Class2</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2() * @model * @generated @@ -31,15 +32,15 @@ import org.eclipse.emf.ecore.EObject; public interface Class2 extends EObject { /** - * Returns the value of the '<em><b>Class1</b></em>' reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model3.Class1}. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Class1</b></em>' reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model3.Class1}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Class1</em>' reference list isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Class1</em>' reference list. * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2_Class1() * @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2 diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java index 0664d4b9e8..a0dd4d8bf5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackageFactory.java @@ -15,30 +15,29 @@ import org.eclipse.emf.ecore.EFactory; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage * @generated */ public interface SubpackageFactory extends EFactory { /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ SubpackageFactory eINSTANCE = org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackageFactoryImpl.init(); /** - * Returns a new object of class '<em>Class2</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Class2</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Class2</em>'. * @generated */ Class2 createClass2(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java index 8c42d46964..ceec672567 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/SubpackagePackage.java @@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory * @model kind="package" * @generated @@ -31,37 +30,36 @@ import org.eclipse.emf.ecore.EReference; public interface SubpackagePackage extends EPackage { /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "subpackage"; /** - * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace URI. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "subpackage"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl <em>Class2</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl <em>Class2</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl#getClass2() * @generated @@ -69,16 +67,16 @@ public interface SubpackagePackage extends EPackage int CLASS2 = 0; /** - * The feature id for the '<em><b>Class1</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Class1</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CLASS2__CLASS1 = 0; /** - * The number of structural features of the '<em>Class2</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Class2</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -87,7 +85,6 @@ public interface SubpackagePackage extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2 <em>Class2</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Class2</em>'. * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2 * @generated @@ -95,10 +92,9 @@ public interface SubpackagePackage extends EPackage EClass getClass2(); /** - * Returns the meta object for the reference list ' - * {@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the reference list '<em>Class1</em>'. * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1() * @see #getClass2() @@ -107,8 +103,8 @@ public interface SubpackagePackage extends EPackage EReference getClass2_Class1(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ @@ -123,15 +119,13 @@ public interface SubpackagePackage extends EPackage * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl - * <em>Class2</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl <em>Class2</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl * @see org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl#getClass2() * @generated @@ -139,9 +133,9 @@ public interface SubpackagePackage extends EPackage EClass CLASS2 = eINSTANCE.getClass2(); /** - * The meta object literal for the '<em><b>Class1</b></em>' reference list feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Class1</b></em>' reference list feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference CLASS2__CLASS1 = eINSTANCE.getClass2_Class1(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java index a8a39ace14..daaa3c0978 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/Class2Impl.java @@ -24,17 +24,16 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl#getClass1 <em>Class1</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl#getClass1 <em>Class1</em>}</li> * </ul> * </p> - * + * * @generated */ public class Class2Impl extends CDOObjectImpl implements Class2 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected Class2Impl() @@ -44,7 +43,6 @@ public class Class2Impl extends CDOObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -55,7 +53,6 @@ public class Class2Impl extends CDOObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class Class2Impl extends CDOObjectImpl implements Class2 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java index db8dbadc89..3b664f8ff5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java @@ -22,14 +22,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFactory { /** - * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the default factory implementation. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static SubpackageFactory init() @@ -51,8 +50,8 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public SubpackageFactoryImpl() @@ -62,7 +61,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -79,7 +77,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Class2 createClass2() @@ -90,7 +87,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SubpackagePackage getSubpackagePackage() @@ -100,7 +96,6 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java index d29e812104..0eb4cec1c9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java @@ -24,14 +24,12 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass class2EClass = null; @@ -56,18 +54,17 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * <p> - * This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed. Clients should - * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc - * --> <!-- end-user-doc --> * + * <p>This method is used to initialize {@link SubpackagePackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc + * --> <!-- end-user-doc --> * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -110,7 +107,6 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClass2() @@ -120,7 +116,6 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getClass2_Class1() @@ -130,7 +125,6 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SubpackageFactory getSubpackageFactory() @@ -140,15 +134,14 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() @@ -164,15 +157,14 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java index 8b91b8ce60..009034998b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageAdapterFactory.java @@ -21,22 +21,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage * @generated */ public class SubpackageAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static SubpackagePackage modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public SubpackageAdapterFactory() @@ -48,10 +47,10 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -70,8 +69,8 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>() @@ -90,10 +89,9 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -104,10 +102,9 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2 - * <em>Class2</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.subpackage.Class2 <em>Class2</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2 * @generated @@ -118,9 +115,9 @@ public class SubpackageAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java index 9737d87f70..59438ac3be 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java @@ -13,32 +13,30 @@ package org.eclipse.emf.cdo.tests.model3.subpackage.util; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - -import java.util.List; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.util.Switch; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage * @generated */ -public class SubpackageSwitch<T> +public class SubpackageSwitch<T> extends Switch<T> { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static SubpackagePackage modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public SubpackageSwitch() @@ -50,44 +48,26 @@ public class SubpackageSwitch<T> } /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public T doSwitch(EObject theEObject) - { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. + * Checks whether this is a switch for the given package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @parameter ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - protected T doSwitch(EClass theEClass, EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -106,11 +86,10 @@ public class SubpackageSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Class2</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Class2</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Class2</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -121,16 +100,16 @@ public class SubpackageSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java index fea583ff2b..f69ade8ebc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.tests.model3.util; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -30,22 +31,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.Model3Package * @generated */ public class Model3AdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static Model3Package modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model3AdapterFactory() @@ -57,10 +57,10 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -79,8 +79,8 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected Model3Switch<Adapter> modelSwitch = new Model3Switch<Adapter>() @@ -146,6 +146,12 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } @Override + public Adapter caseClassWithIDAttribute(ClassWithIDAttribute object) + { + return createClassWithIDAttributeAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -153,10 +159,9 @@ public class Model3AdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -170,7 +175,6 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.Class1 <em>Class1</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.Class1 * @generated @@ -184,7 +188,6 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.MetaRef <em>Meta Ref</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.MetaRef * @generated @@ -198,7 +201,6 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.Polygon <em>Polygon</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.Polygon * @generated @@ -209,11 +211,10 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates - * <em>Polygon With Duplicates</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates <em>Polygon With Duplicates</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates * @generated @@ -308,9 +309,24 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute <em>Class With ID Attribute</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute + * @generated + */ + public Adapter createClassWithIDAttributeAdapter() + { + return null; + } + + /** + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java index ee36791c5b..43222d0dd8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.tests.model3.util; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -22,32 +23,30 @@ import org.eclipse.emf.cdo.tests.model3.NodeD; import org.eclipse.emf.cdo.tests.model3.Polygon; import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; - -import java.util.List; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.util.Switch; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model3.Model3Package * @generated */ -public class Model3Switch<T> +public class Model3Switch<T> extends Switch<T> { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static Model3Package modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model3Switch() @@ -59,44 +58,26 @@ public class Model3Switch<T> } /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public T doSwitch(EObject theEObject) - { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the first non-null result returned by a <code>caseXXX</code> call. + * Checks whether this is a switch for the given package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @parameter ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - protected T doSwitch(EClass theEClass, EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -181,17 +162,24 @@ public class Model3Switch<T> result = defaultCase(theEObject); return result; } + case Model3Package.CLASS_WITH_ID_ATTRIBUTE: + { + ClassWithIDAttribute classWithIDAttribute = (ClassWithIDAttribute)theEObject; + T result = caseClassWithIDAttribute(classWithIDAttribute); + if (result == null) + result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } /** - * Returns the result of interpreting the object as an instance of '<em>Class1</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Class1</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Class1</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -202,11 +190,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Meta Ref</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Meta Ref</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Meta Ref</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -217,11 +204,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Polygon</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Polygon</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Polygon</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -248,11 +234,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node A</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node A</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node A</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -263,11 +248,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node B</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node B</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node B</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -278,11 +262,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node C</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node C</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node C</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -293,11 +276,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Node D</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Node D</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Node D</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -308,11 +290,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Image</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Image</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Image</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -323,11 +304,10 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>File</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>File</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>File</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -338,16 +318,32 @@ public class Model3Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClassWithIDAttribute(ClassWithIDAttribute object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; |