diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3')
65 files changed, 1992 insertions, 1402 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.core.resources.prefs index a95794d385..ebab8c9b93 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.cdo.tests.model3/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ -#Mon Jul 04 13:00:26 CEST 2011 eclipse.preferences.version=1 - +encoding//model/model3.ecore=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF index acd272c426..d455fd0842 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true -Bundle-Version: 3.0.200.qualifier +Bundle-Version: 3.0.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -14,9 +14,9 @@ Export-Package: org.eclipse.emf.cdo.tests.legacy.model3;version="3.0.200", org.eclipse.emf.cdo.tests.legacy.model3.impl;version="3.0.200", org.eclipse.emf.cdo.tests.legacy.model3.subpackage;version="3.0.200", org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl;version="3.0.200", - org.eclipse.emf.cdo.tests.model3;version="3.0.200", - org.eclipse.emf.cdo.tests.model3.impl;version="3.0.200", - org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.200", - org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.200", - org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.200", - org.eclipse.emf.cdo.tests.model3.util;version="3.0.200" + org.eclipse.emf.cdo.tests.model3;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.impl;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.util;version="3.0.300" diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore index b36efb8622..059d9fa358 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model3" - nsURI="http://www.eclipse.org/emf/CDO/tests/model3/1.0.0" nsPrefix="model3"> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model3" nsURI="http://www.eclipse.org/emf/CDO/tests/model3/1.0.0" + nsPrefix="model3"> <eClassifiers xsi:type="ecore:EClass" name="Class1"> <eStructuralFeatures xsi:type="ecore:EReference" name="class2" upperBound="-1" eType="#//subpackage/Class2" unsettable="true" eOpposite="#//subpackage/Class2/class1"/> @@ -70,6 +69,17 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString" iD="true"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ClassWithJavaClassAttribute"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" iD="true"> + <eGenericType eClassifier="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaClass"> + <eTypeArguments/> + </eGenericType> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ClassWithJavaObjectAttribute"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaObject" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject" + iD="true"/> + </eClassifiers> <eSubpackages name="subpackage" nsURI="http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0" nsPrefix="subpackage"> <eClassifiers xsi:type="ecore:EClass" name="Class2"> 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 8a6f5d86ca..479241de64 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 @@ -12,6 +12,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -25,110 +27,127 @@ 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 a new object of class '<em>Class With ID Attribute</em>'. <!-- 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 --> - * + * Returns a new object of class '<em>Class With Java Class Attribute</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Class With Java Class Attribute</em>'. + * @generated + */ + ClassWithJavaClassAttribute createClassWithJavaClassAttribute(); + + /** + * Returns a new object of class '<em>Class With Java Object Attribute</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Class With Java Object Attribute</em>'. + * @generated + */ + ClassWithJavaObjectAttribute createClassWithJavaObjectAttribute(); + + /** + * 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 c12f092a23..7863be4ba8 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,33 +427,32 @@ 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 '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithIDAttributeImpl - * <em>Class With ID Attribute</em>}' class. <!-- 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 @@ -472,30 +460,86 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int CLASS_WITH_ID_ATTRIBUTE = 10; /** - * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * 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 --> <!-- + * 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 --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaClassAttributeImpl <em>Class With Java Class Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaClassAttributeImpl + * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClassWithJavaClassAttribute() + * @generated + */ + int CLASS_WITH_JAVA_CLASS_ATTRIBUTE = 11; + + /** + * The feature id for the '<em><b>Java Class</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS = 0; + + /** + * The number of structural features of the '<em>Class With Java Class Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_CLASS_ATTRIBUTE_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaObjectAttributeImpl <em>Class With Java Object Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaObjectAttributeImpl + * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClassWithJavaObjectAttribute() + * @generated + */ + int CLASS_WITH_JAVA_OBJECT_ATTRIBUTE = 12; + + /** + * The feature id for the '<em><b>Java Object</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT = 0; + + /** + * The number of structural features of the '<em>Class With Java Object Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_OBJECT_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 = 11; + int POINT = 13; /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1 <em>Class1</em>}'. <!-- @@ -508,9 +552,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() @@ -529,9 +572,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() @@ -540,9 +582,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() @@ -551,9 +592,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() @@ -572,9 +612,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() @@ -583,9 +622,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 @@ -615,10 +653,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() @@ -627,9 +664,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() @@ -638,9 +674,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() @@ -659,10 +694,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() @@ -671,10 +705,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() @@ -683,9 +716,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() @@ -704,10 +736,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() @@ -716,10 +747,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() @@ -728,9 +758,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() @@ -739,9 +768,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() @@ -772,10 +800,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() @@ -784,10 +811,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() @@ -796,9 +822,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() @@ -807,9 +832,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() @@ -818,9 +842,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() @@ -839,9 +862,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() @@ -850,9 +872,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() @@ -861,9 +882,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() @@ -882,9 +902,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() @@ -893,9 +912,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() @@ -904,9 +922,8 @@ 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 --> - * + * 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 @@ -914,10 +931,9 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa 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 --> + * 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() @@ -926,6 +942,48 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa EAttribute getClassWithIDAttribute_Id(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaClassAttribute <em>Class With Java Class Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Class With Java Class Attribute</em>'. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaClassAttribute + * @generated + */ + EClass getClassWithJavaClassAttribute(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaClassAttribute#getJavaClass <em>Java Class</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Java Class</em>'. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaClassAttribute#getJavaClass() + * @see #getClassWithJavaClassAttribute() + * @generated + */ + EAttribute getClassWithJavaClassAttribute_JavaClass(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaObjectAttribute <em>Class With Java Object Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Class With Java Object Attribute</em>'. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaObjectAttribute + * @generated + */ + EClass getClassWithJavaObjectAttribute(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaObjectAttribute#getJavaObject <em>Java Object</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Java Object</em>'. + * @see org.eclipse.emf.cdo.tests.legacy.model3.ClassWithJavaObjectAttribute#getJavaObject() + * @see #getClassWithJavaObjectAttribute() + * @generated + */ + EAttribute getClassWithJavaObjectAttribute_JavaObject(); + + /** * Returns the meta object for data type '{@link org.eclipse.emf.cdo.tests.model3.Point <em>Point</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -937,8 +995,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 c3788a23a1..db1ae8de85 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 index 0d1a8a9bd7..0e0d0e5e4b 100644 --- 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 @@ -24,17 +24,17 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithIDAttributeImpl#getId <em>Id</em>}</li> + * <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 --> - * + * The default value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getId() * @generated * @ordered @@ -42,8 +42,8 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID protected static final String ID_EDEFAULT = null; /** - * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getId() * @generated * @ordered @@ -52,7 +52,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected ClassWithIDAttributeImpl() @@ -62,7 +61,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -73,7 +71,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getId() @@ -83,7 +80,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setId(String newId) @@ -96,7 +92,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -112,7 +107,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -129,7 +123,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -146,7 +139,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -162,7 +154,6 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID /** * <!-- 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/ClassWithJavaClassAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithJavaClassAttributeImpl.java new file mode 100644 index 0000000000..3704a42a38 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithJavaClassAttributeImpl.java @@ -0,0 +1,167 @@ +/** + */ +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.ClassWithJavaClassAttribute; + +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 Java Class Attribute</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaClassAttributeImpl#getJavaClass <em>Java Class</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class ClassWithJavaClassAttributeImpl extends EObjectImpl implements ClassWithJavaClassAttribute +{ + /** + * The cached value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getJavaClass() + * @generated + * @ordered + */ + protected Class<?> javaClass; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ClassWithJavaClassAttributeImpl() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return Model3Package.eINSTANCE.getClassWithJavaClassAttribute(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Class<?> getJavaClass() + { + return javaClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setJavaClass(Class<?> newJavaClass) + { + Class<?> oldJavaClass = javaClass; + javaClass = newJavaClass; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS, + oldJavaClass, javaClass)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS: + return getJavaClass(); + } + 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_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS: + setJavaClass((Class<?>)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_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS: + setJavaClass((Class<?>)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS: + return javaClass != null; + } + 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(" (javaClass: "); + result.append(javaClass); + result.append(')'); + return result.toString(); + } + +} //ClassWithJavaClassAttributeImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithJavaObjectAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithJavaObjectAttributeImpl.java new file mode 100644 index 0000000000..5035a0edc2 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ClassWithJavaObjectAttributeImpl.java @@ -0,0 +1,177 @@ +/** + */ +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.ClassWithJavaObjectAttribute; + +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 Java Object Attribute</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaObjectAttributeImpl#getJavaObject <em>Java Object</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class ClassWithJavaObjectAttributeImpl extends EObjectImpl implements ClassWithJavaObjectAttribute +{ + /** + * The default value of the '{@link #getJavaObject() <em>Java Object</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getJavaObject() + * @generated + * @ordered + */ + protected static final Object JAVA_OBJECT_EDEFAULT = null; + + /** + * The cached value of the '{@link #getJavaObject() <em>Java Object</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getJavaObject() + * @generated + * @ordered + */ + protected Object javaObject = JAVA_OBJECT_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ClassWithJavaObjectAttributeImpl() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return Model3Package.eINSTANCE.getClassWithJavaObjectAttribute(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Object getJavaObject() + { + return javaObject; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setJavaObject(Object newJavaObject) + { + Object oldJavaObject = javaObject; + javaObject = newJavaObject; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, + Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT, oldJavaObject, javaObject)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT: + return getJavaObject(); + } + 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_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT: + setJavaObject(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_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT: + setJavaObject(JAVA_OBJECT_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT: + return JAVA_OBJECT_EDEFAULT == null ? javaObject != null : !JAVA_OBJECT_EDEFAULT.equals(javaObject); + } + 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(" (javaObject: "); + result.append(javaObject); + result.append(')'); + return result.toString(); + } + +} //ClassWithJavaObjectAttributeImpl 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 10bd37e160..49d30e44b9 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 f6a02f9899..7c61ba75c2 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 d424d84b14..87761a58b5 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 e630365400..f8a5405d47 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 @@ -14,6 +14,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -34,7 +36,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 @@ -63,8 +64,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() @@ -74,7 +75,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -104,6 +104,10 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory return createFile(); case Model3Package.CLASS_WITH_ID_ATTRIBUTE: return createClassWithIDAttribute(); + case Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE: + return createClassWithJavaClassAttribute(); + case Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE: + return createClassWithJavaObjectAttribute(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -111,7 +115,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -128,7 +131,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -145,7 +147,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Class1 createClass1() @@ -156,7 +157,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public MetaRef createMetaRef() @@ -167,7 +167,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Polygon createPolygon() @@ -178,7 +177,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public PolygonWithDuplicates createPolygonWithDuplicates() @@ -189,7 +187,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeA createNodeA() @@ -200,7 +197,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeB createNodeB() @@ -211,7 +207,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeC createNodeC() @@ -222,7 +217,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD createNodeD() @@ -233,7 +227,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Image createImage() @@ -244,7 +237,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public File createFile() @@ -255,7 +247,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ClassWithIDAttribute createClassWithIDAttribute() @@ -265,6 +256,28 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ClassWithJavaClassAttribute createClassWithJavaClassAttribute() + { + ClassWithJavaClassAttributeImpl classWithJavaClassAttribute = new ClassWithJavaClassAttributeImpl(); + return classWithJavaClassAttribute; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ClassWithJavaObjectAttribute createClassWithJavaObjectAttribute() + { + ClassWithJavaObjectAttributeImpl classWithJavaObjectAttribute = new ClassWithJavaObjectAttributeImpl(); + return classWithJavaObjectAttribute; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated NOT @@ -286,7 +299,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Package getModel3Package() @@ -296,7 +308,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 0f8113f8a6..e060de1896 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 @@ -17,6 +17,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -31,6 +33,7 @@ import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; @@ -38,91 +41,92 @@ 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 EClass classWithJavaClassAttributeEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass classWithJavaObjectAttributeEClass = null; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType pointEDataType = null; @@ -147,18 +151,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() @@ -167,9 +170,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public static Model3Package init() { if (isInited) - { return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI); - } // Obtain or create and register package Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE @@ -203,7 +204,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClass1() @@ -213,7 +213,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getClass1_Class2() @@ -223,7 +222,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getMetaRef() @@ -233,7 +231,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EPackageRef() @@ -243,7 +240,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EClassRef() @@ -253,7 +249,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EReferenceRef() @@ -263,7 +258,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygon() @@ -273,7 +267,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygon_Points() @@ -283,7 +276,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygonWithDuplicates() @@ -293,7 +285,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygonWithDuplicates_Points() @@ -303,7 +294,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeA() @@ -313,7 +303,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_Children() @@ -323,7 +312,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeA_Name() @@ -333,7 +321,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_OtherNodes() @@ -343,7 +330,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeB() @@ -353,7 +339,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Children() @@ -363,7 +348,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Parent() @@ -373,7 +357,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeB_Name() @@ -383,7 +366,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeC() @@ -393,7 +375,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Children() @@ -403,7 +384,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Parent() @@ -413,7 +393,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeC_Name() @@ -423,7 +402,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OtherNodes() @@ -433,7 +411,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OppositeNodes() @@ -443,7 +420,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeD() @@ -453,7 +429,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Children() @@ -463,7 +438,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Parent() @@ -473,7 +447,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeD_Name() @@ -483,7 +456,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OtherNodes() @@ -493,7 +465,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OppositeNode() @@ -503,7 +474,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getImage() @@ -513,7 +483,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Width() @@ -523,7 +492,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Height() @@ -533,7 +501,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Data() @@ -543,7 +510,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getFile() @@ -553,7 +519,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Name() @@ -563,7 +528,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Data() @@ -573,7 +537,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClassWithIDAttribute() @@ -583,7 +546,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getClassWithIDAttribute_Id() @@ -592,8 +554,47 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getClassWithJavaClassAttribute() + { + return classWithJavaClassAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClassWithJavaClassAttribute_JavaClass() + { + return (EAttribute)classWithJavaClassAttributeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getClassWithJavaObjectAttribute() + { + return classWithJavaObjectAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClassWithJavaObjectAttribute_JavaObject() + { + return (EAttribute)classWithJavaObjectAttributeEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getPoint() @@ -603,7 +604,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Factory getModel3Factory() @@ -613,23 +613,20 @@ 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() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -683,29 +680,32 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package classWithIDAttributeEClass = createEClass(CLASS_WITH_ID_ATTRIBUTE); createEAttribute(classWithIDAttributeEClass, CLASS_WITH_ID_ATTRIBUTE__ID); + classWithJavaClassAttributeEClass = createEClass(CLASS_WITH_JAVA_CLASS_ATTRIBUTE); + createEAttribute(classWithJavaClassAttributeEClass, CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS); + + classWithJavaObjectAttributeEClass = createEClass(CLASS_WITH_JAVA_OBJECT_ATTRIBUTE); + createEAttribute(classWithJavaObjectAttributeEClass, CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT); + // 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() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -746,65 +746,66 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE, - IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPolygon_Points(), this.getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPolygonWithDuplicates_Points(), this.getPoint(), "points", null, 1, -1, + PolygonWithDuplicates.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(nodeAEClass, NodeA.class, "NodeA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT, + initEReference(getNodeA_Children(), this.getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT, + initEReference(getNodeA_OtherNodes(), this.getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(nodeBEClass, NodeB.class, "NodeB", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class, + initEReference(getNodeB_Children(), this.getNodeB(), this.getNodeB_Parent(), "children", null, 0, -1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class, + initEReference(getNodeB_Parent(), this.getNodeB(), this.getNodeB_Children(), "parent", null, 0, 1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(nodeCEClass, NodeC.class, "NodeC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class, + initEReference(getNodeC_Children(), this.getNodeC(), this.getNodeC_Parent(), "children", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class, + initEReference(getNodeC_Parent(), this.getNodeC(), this.getNodeC_Children(), "parent", null, 0, 1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1, + initEReference(getNodeC_OtherNodes(), this.getNodeC(), this.getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, + NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getNodeC_OppositeNodes(), this.getNodeC(), this.getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1, NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(nodeDEClass, NodeD.class, "NodeD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class, + initEReference(getNodeD_Children(), this.getNodeD(), this.getNodeD_Parent(), "children", null, 0, -1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class, + initEReference(getNodeD_Parent(), this.getNodeD(), this.getNodeD_Children(), "parent", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getNodeD_OtherNodes(), this.getNodeD(), this.getNodeD_OppositeNode(), "otherNodes", null, 0, -1, + NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getNodeD_OppositeNode(), this.getNodeD(), this.getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, + NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getImage_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, Image.class, !IS_TRANSIENT, @@ -826,6 +827,21 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(classWithJavaClassAttributeEClass, ClassWithJavaClassAttribute.class, "ClassWithJavaClassAttribute", + !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + EGenericType g1 = createEGenericType(theEcorePackage.getEJavaClass()); + EGenericType g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1, + ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute", + !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getClassWithJavaObjectAttribute_JavaObject(), theEcorePackage.getEJavaObject(), "javaObject", null, + 0, 1, ClassWithJavaObjectAttribute.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 663a2d8cc6..a25e0225c5 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 8472976790..abc331af1b 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 ddb9ddbda8..565362ed6a 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 451c18475f..f70fd23b1c 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 8fac84abd1..9817bbf228 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 64d4abdac2..07bc486e8b 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 8ee54fa886..bbd13e651d 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 6e764a508d..bb87ce4933 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 334ad74bcb..d8426de7d7 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 78554f53a1..ab85c53c64 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 4e35814a1c..3e286f86b7 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/model3/Class1.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java index acb98496e0..efb2779c46 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 index 9b3b8ab299..1f59ba2b9c 100644 --- 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 @@ -15,13 +15,14 @@ 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> + * <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 @@ -29,12 +30,12 @@ import org.eclipse.emf.ecore.EObject; public interface ClassWithIDAttribute extends EObject { /** - * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> + * 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() @@ -46,9 +47,7 @@ public interface ClassWithIDAttribute extends EObject /** * 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. + * @param value the new value of the '<em>Id</em>' attribute. * @see #getId() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java new file mode 100644 index 0000000000..052a5e2b62 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaClassAttribute.java @@ -0,0 +1,51 @@ +/** + */ +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 Java Class Attribute</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute#getJavaClass <em>Java Class</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaClassAttribute() + * @model + * @generated + */ +public interface ClassWithJavaClassAttribute extends EObject +{ + /** + * Returns the value of the '<em><b>Java Class</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Java Class</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Java Class</em>' attribute. + * @see #setJavaClass(Class) + * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaClassAttribute_JavaClass() + * @model id="true" + * @generated + */ + Class<?> getJavaClass(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute#getJavaClass <em>Java Class</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Java Class</em>' attribute. + * @see #getJavaClass() + * @generated + */ + void setJavaClass(Class<?> value); + +} // ClassWithJavaClassAttribute diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java new file mode 100644 index 0000000000..e92ba1cfd9 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/ClassWithJavaObjectAttribute.java @@ -0,0 +1,51 @@ +/** + */ +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 Java Object Attribute</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute#getJavaObject <em>Java Object</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaObjectAttribute() + * @model + * @generated + */ +public interface ClassWithJavaObjectAttribute extends EObject +{ + /** + * Returns the value of the '<em><b>Java Object</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Java Object</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Java Object</em>' attribute. + * @see #setJavaObject(Object) + * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaObjectAttribute_JavaObject() + * @model id="true" + * @generated + */ + Object getJavaObject(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute#getJavaObject <em>Java Object</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Java Object</em>' attribute. + * @see #getJavaObject() + * @generated + */ + void setJavaObject(Object value); + +} // ClassWithJavaObjectAttribute 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 238e8f7027..429a3ea47f 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 753c0a548e..f26d52c3fe 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 82540fefaf..1f33a4a2c7 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 1c7ffd1ddc..ab1e8d9ba8 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,110 +15,127 @@ 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 a new object of class '<em>Class With ID Attribute</em>'. <!-- 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 --> - * + * Returns a new object of class '<em>Class With Java Class Attribute</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Class With Java Class Attribute</em>'. + * @generated + */ + ClassWithJavaClassAttribute createClassWithJavaClassAttribute(); + + /** + * Returns a new object of class '<em>Class With Java Object Attribute</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Class With Java Object Attribute</em>'. + * @generated + */ + ClassWithJavaObjectAttribute createClassWithJavaObjectAttribute(); + + /** + * 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 d12e743b5b..54c1a057f7 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,33 +436,32 @@ 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 '{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithIDAttributeImpl - * <em>Class With ID Attribute</em>}' class. <!-- 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 @@ -473,30 +469,86 @@ public interface Model3Package extends EPackage int CLASS_WITH_ID_ATTRIBUTE = 10; /** - * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * 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 --> <!-- + * 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 --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithJavaClassAttributeImpl <em>Class With Java Class Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.impl.ClassWithJavaClassAttributeImpl + * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClassWithJavaClassAttribute() + * @generated + */ + int CLASS_WITH_JAVA_CLASS_ATTRIBUTE = 11; + + /** + * The feature id for the '<em><b>Java Class</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS = 0; + + /** + * The number of structural features of the '<em>Class With Java Class Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_CLASS_ATTRIBUTE_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithJavaObjectAttributeImpl <em>Class With Java Object Attribute</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.impl.ClassWithJavaObjectAttributeImpl + * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClassWithJavaObjectAttribute() + * @generated + */ + int CLASS_WITH_JAVA_OBJECT_ATTRIBUTE = 12; + + /** + * The feature id for the '<em><b>Java Object</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT = 0; + + /** + * The number of structural features of the '<em>Class With Java Object Attribute</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS_WITH_JAVA_OBJECT_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 = 11; + int POINT = 13; /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Class1 <em>Class1</em>}'. <!-- @@ -509,9 +561,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() @@ -530,9 +581,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() @@ -541,9 +591,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() @@ -552,9 +601,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() @@ -573,9 +621,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() @@ -584,9 +631,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 @@ -594,10 +640,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() @@ -616,10 +661,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() @@ -630,7 +674,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() @@ -639,9 +682,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() @@ -660,10 +702,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() @@ -672,9 +713,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() @@ -685,7 +725,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() @@ -704,10 +743,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() @@ -716,9 +754,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() @@ -729,7 +766,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() @@ -738,9 +774,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() @@ -749,9 +784,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() @@ -770,10 +804,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() @@ -782,9 +815,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() @@ -795,7 +827,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() @@ -804,9 +835,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() @@ -815,9 +845,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() @@ -838,7 +867,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() @@ -847,9 +875,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() @@ -860,7 +887,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() @@ -881,7 +907,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() @@ -892,7 +917,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() @@ -901,9 +925,8 @@ 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 --> - * + * 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 @@ -911,9 +934,8 @@ public interface Model3Package extends EPackage 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 --> - * + * 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() @@ -922,6 +944,48 @@ public interface Model3Package extends EPackage EAttribute getClassWithIDAttribute_Id(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute <em>Class With Java Class Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Class With Java Class Attribute</em>'. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute + * @generated + */ + EClass getClassWithJavaClassAttribute(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute#getJavaClass <em>Java Class</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Java Class</em>'. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute#getJavaClass() + * @see #getClassWithJavaClassAttribute() + * @generated + */ + EAttribute getClassWithJavaClassAttribute_JavaClass(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute <em>Class With Java Object Attribute</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Class With Java Object Attribute</em>'. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute + * @generated + */ + EClass getClassWithJavaObjectAttribute(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute#getJavaObject <em>Java Object</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Java Object</em>'. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute#getJavaObject() + * @see #getClassWithJavaObjectAttribute() + * @generated + */ + EAttribute getClassWithJavaObjectAttribute_JavaObject(); + + /** * Returns the meta object for data type '{@link org.eclipse.emf.cdo.tests.model3.Point <em>Point</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * @@ -933,8 +997,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 118bb89bcc..6d1faeabd0 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 7eb1ad92ba..4a017b80d1 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 d90abe378c..c9336c6bb8 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 09efb6d574..99f8ea4eec 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 4be7fb8305..d3f1056eee 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 ac7346ac23..596f2d89b4 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 e135c0a43f..728a359e8a 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 index ace258e420..047be2a675 100644 --- 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 @@ -23,17 +23,16 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithIDAttributeImpl#getId <em>Id</em>}</li> + * <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() @@ -43,7 +42,6 @@ public class ClassWithIDAttributeImpl extends CDOObjectImpl implements ClassWith /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -54,7 +52,6 @@ public class ClassWithIDAttributeImpl extends CDOObjectImpl implements ClassWith /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -65,7 +62,6 @@ public class ClassWithIDAttributeImpl extends CDOObjectImpl implements ClassWith /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getId() @@ -75,7 +71,6 @@ public class ClassWithIDAttributeImpl extends CDOObjectImpl implements ClassWith /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setId(String newId) diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaClassAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaClassAttributeImpl.java new file mode 100644 index 0000000000..59e32d124d --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaClassAttributeImpl.java @@ -0,0 +1,79 @@ +/** + */ +package org.eclipse.emf.cdo.tests.model3.impl; + +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute; +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 Java Class Attribute</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithJavaClassAttributeImpl#getJavaClass <em>Java Class</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class ClassWithJavaClassAttributeImpl extends CDOObjectImpl implements ClassWithJavaClassAttribute +{ + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ClassWithJavaClassAttributeImpl() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return Model3Package.eINSTANCE.getClassWithJavaClassAttribute(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected int eStaticFeatureCount() + { + return 0; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Class<?> getJavaClass() + { + return (Class<?>)eGet(Model3Package.eINSTANCE.getClassWithJavaClassAttribute_JavaClass(), true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setJavaClass(Class<?> newJavaClass) + { + eSet(Model3Package.eINSTANCE.getClassWithJavaClassAttribute_JavaClass(), newJavaClass); + } + +} //ClassWithJavaClassAttributeImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java new file mode 100644 index 0000000000..fc0588f416 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ClassWithJavaObjectAttributeImpl.java @@ -0,0 +1,79 @@ +/** + */ +package org.eclipse.emf.cdo.tests.model3.impl; + +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; +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 Java Object Attribute</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.ClassWithJavaObjectAttributeImpl#getJavaObject <em>Java Object</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class ClassWithJavaObjectAttributeImpl extends CDOObjectImpl implements ClassWithJavaObjectAttribute +{ + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected ClassWithJavaObjectAttributeImpl() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return Model3Package.eINSTANCE.getClassWithJavaObjectAttribute(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected int eStaticFeatureCount() + { + return 0; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Object getJavaObject() + { + return (Object)eGet(Model3Package.eINSTANCE.getClassWithJavaObjectAttribute_JavaObject(), true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setJavaObject(Object newJavaObject) + { + eSet(Model3Package.eINSTANCE.getClassWithJavaObjectAttribute_JavaObject(), newJavaObject); + } + +} //ClassWithJavaObjectAttributeImpl 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 2849114cf5..75dcc48954 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 6c21c7e48e..dc64dc51e1 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 97940a6375..1e7ca02188 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 c5a580c900..139882cb0e 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 @@ -12,6 +12,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -34,14 +36,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() @@ -63,8 +64,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() @@ -74,7 +75,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -104,6 +104,10 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory return createFile(); case Model3Package.CLASS_WITH_ID_ATTRIBUTE: return createClassWithIDAttribute(); + case Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE: + return createClassWithJavaClassAttribute(); + case Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE: + return createClassWithJavaObjectAttribute(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -111,7 +115,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -128,7 +131,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -145,7 +147,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Class1 createClass1() @@ -156,7 +157,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public MetaRef createMetaRef() @@ -167,7 +167,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Polygon createPolygon() @@ -178,7 +177,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public PolygonWithDuplicates createPolygonWithDuplicates() @@ -189,7 +187,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeA createNodeA() @@ -200,7 +197,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeB createNodeB() @@ -211,7 +207,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeC createNodeC() @@ -222,7 +217,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NodeD createNodeD() @@ -233,7 +227,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Image createImage() @@ -244,7 +237,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public File createFile() @@ -255,7 +247,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ClassWithIDAttribute createClassWithIDAttribute() @@ -265,6 +256,28 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ClassWithJavaClassAttribute createClassWithJavaClassAttribute() + { + ClassWithJavaClassAttributeImpl classWithJavaClassAttribute = new ClassWithJavaClassAttributeImpl(); + return classWithJavaClassAttribute; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ClassWithJavaObjectAttribute createClassWithJavaObjectAttribute() + { + ClassWithJavaObjectAttributeImpl classWithJavaObjectAttribute = new ClassWithJavaObjectAttributeImpl(); + return classWithJavaObjectAttribute; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated NOT @@ -286,7 +299,6 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Package getModel3Package() @@ -296,7 +308,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 33f5dc71a5..ea7c58ad73 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 @@ -13,6 +13,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -31,6 +33,7 @@ import org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; @@ -38,91 +41,92 @@ 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 EClass classWithJavaClassAttributeEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass classWithJavaObjectAttributeEClass = null; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType pointEDataType = null; @@ -147,18 +151,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() @@ -201,7 +204,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClass1() @@ -211,7 +213,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getClass1_Class2() @@ -221,7 +222,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getMetaRef() @@ -231,7 +231,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EPackageRef() @@ -241,7 +240,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EClassRef() @@ -251,7 +249,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getMetaRef_EReferenceRef() @@ -261,7 +258,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygon() @@ -271,7 +267,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygon_Points() @@ -281,7 +276,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPolygonWithDuplicates() @@ -291,7 +285,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPolygonWithDuplicates_Points() @@ -301,7 +294,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeA() @@ -311,7 +303,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_Children() @@ -321,7 +312,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeA_Name() @@ -331,7 +321,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeA_OtherNodes() @@ -341,7 +330,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeB() @@ -351,7 +339,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Children() @@ -361,7 +348,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeB_Parent() @@ -371,7 +357,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeB_Name() @@ -381,7 +366,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeC() @@ -391,7 +375,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Children() @@ -401,7 +384,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_Parent() @@ -411,7 +393,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeC_Name() @@ -421,7 +402,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OtherNodes() @@ -431,7 +411,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeC_OppositeNodes() @@ -441,7 +420,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getNodeD() @@ -451,7 +429,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Children() @@ -461,7 +438,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_Parent() @@ -471,7 +447,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getNodeD_Name() @@ -481,7 +456,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OtherNodes() @@ -491,7 +465,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getNodeD_OppositeNode() @@ -501,7 +474,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getImage() @@ -511,7 +483,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Width() @@ -521,7 +492,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Height() @@ -531,7 +501,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getImage_Data() @@ -541,7 +510,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getFile() @@ -551,7 +519,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Name() @@ -561,7 +528,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_Data() @@ -571,7 +537,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getClassWithIDAttribute() @@ -581,7 +546,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getClassWithIDAttribute_Id() @@ -590,8 +554,47 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getClassWithJavaClassAttribute() + { + return classWithJavaClassAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClassWithJavaClassAttribute_JavaClass() + { + return (EAttribute)classWithJavaClassAttributeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getClassWithJavaObjectAttribute() + { + return classWithJavaObjectAttributeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClassWithJavaObjectAttribute_JavaObject() + { + return (EAttribute)classWithJavaObjectAttributeEClass.getEStructuralFeatures().get(0); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getPoint() @@ -601,7 +604,6 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model3Factory getModel3Factory() @@ -611,15 +613,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() @@ -679,21 +680,26 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package classWithIDAttributeEClass = createEClass(CLASS_WITH_ID_ATTRIBUTE); createEAttribute(classWithIDAttributeEClass, CLASS_WITH_ID_ATTRIBUTE__ID); + classWithJavaClassAttributeEClass = createEClass(CLASS_WITH_JAVA_CLASS_ATTRIBUTE); + createEAttribute(classWithJavaClassAttributeEClass, CLASS_WITH_JAVA_CLASS_ATTRIBUTE__JAVA_CLASS); + + classWithJavaObjectAttributeEClass = createEClass(CLASS_WITH_JAVA_OBJECT_ATTRIBUTE); + createEAttribute(classWithJavaObjectAttributeEClass, CLASS_WITH_JAVA_OBJECT_ATTRIBUTE__JAVA_OBJECT); + // 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() @@ -821,6 +827,21 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package ClassWithIDAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(classWithJavaClassAttributeEClass, ClassWithJavaClassAttribute.class, "ClassWithJavaClassAttribute", + !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + EGenericType g1 = createEGenericType(theEcorePackage.getEJavaClass()); + EGenericType g2 = createEGenericType(); + g1.getETypeArguments().add(g2); + initEAttribute(getClassWithJavaClassAttribute_JavaClass(), g1, "javaClass", null, 0, 1, + ClassWithJavaClassAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(classWithJavaObjectAttributeEClass, ClassWithJavaObjectAttribute.class, "ClassWithJavaObjectAttribute", + !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getClassWithJavaObjectAttribute_JavaObject(), theEcorePackage.getEJavaObject(), "javaObject", null, + 0, 1, ClassWithJavaObjectAttribute.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 52e9d252f7..5bcd809e27 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 497b06e063..36c2171cb9 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 540b17104a..b766177172 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 3c33eb200b..ed904efe51 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 f4d718d136..4d42cfd29f 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 ba8ad2cbcb..6c0f5b6351 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 94cf19b0cd..9890c418bc 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 5fa60a9ab4..f6f8181cfb 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 41799938d7..5d1f3d3d5e 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 9c44e8c955..eb966851b0 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 22c46fd7f2..931f4704cb 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 85bd2027f3..c59178bf16 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 dd08bff79b..3803960273 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 3ce4a9a749..3f6252e0dd 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 @@ -23,22 +23,21 @@ import java.util.List; * {@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> { /** - * 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() @@ -52,7 +51,6 @@ 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 */ @@ -64,7 +62,6 @@ 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 */ @@ -84,7 +81,6 @@ 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 */ @@ -97,9 +93,7 @@ public class SubpackageSwitch<T> Class2 class2 = (Class2)theEObject; T result = caseClass2(class2); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: @@ -108,11 +102,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 @@ -123,12 +116,11 @@ 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 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 ff701c61e9..1b1271ea1c 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 @@ -12,6 +12,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; import org.eclipse.emf.cdo.tests.model3.File; import org.eclipse.emf.cdo.tests.model3.Image; import org.eclipse.emf.cdo.tests.model3.MetaRef; @@ -31,22 +33,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() @@ -58,10 +59,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 */ @@ -80,8 +81,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>() @@ -153,6 +154,18 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } @Override + public Adapter caseClassWithJavaClassAttribute(ClassWithJavaClassAttribute object) + { + return createClassWithJavaClassAttributeAdapter(); + } + + @Override + public Adapter caseClassWithJavaObjectAttribute(ClassWithJavaObjectAttribute object) + { + return createClassWithJavaObjectAttributeAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -160,10 +173,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 */ @@ -177,7 +189,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 @@ -191,7 +202,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 @@ -205,7 +215,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 @@ -216,11 +225,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 @@ -315,11 +323,10 @@ public class Model3AdapterFactory extends AdapterFactoryImpl } /** - * 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 + * 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 @@ -330,9 +337,39 @@ 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.ClassWithJavaClassAttribute <em>Class With Java Class 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.ClassWithJavaClassAttribute + * @generated + */ + public Adapter createClassWithJavaClassAttributeAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute <em>Class With Java Object 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.ClassWithJavaObjectAttribute + * @generated + */ + public Adapter createClassWithJavaObjectAttributeAdapter() + { + 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 25761daf1b..918a44b784 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 @@ -12,6 +12,8 @@ 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.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; 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,22 +35,21 @@ import java.util.List; * {@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> { /** - * 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() @@ -62,7 +63,6 @@ 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 */ @@ -74,7 +74,6 @@ 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 */ @@ -94,7 +93,6 @@ 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 */ @@ -107,9 +105,7 @@ public class Model3Switch<T> Class1 class1 = (Class1)theEObject; T result = caseClass1(class1); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.META_REF: @@ -117,9 +113,7 @@ public class Model3Switch<T> MetaRef metaRef = (MetaRef)theEObject; T result = caseMetaRef(metaRef); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.POLYGON: @@ -127,9 +121,7 @@ public class Model3Switch<T> Polygon polygon = (Polygon)theEObject; T result = casePolygon(polygon); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.POLYGON_WITH_DUPLICATES: @@ -137,9 +129,7 @@ public class Model3Switch<T> PolygonWithDuplicates polygonWithDuplicates = (PolygonWithDuplicates)theEObject; T result = casePolygonWithDuplicates(polygonWithDuplicates); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.NODE_A: @@ -147,9 +137,7 @@ public class Model3Switch<T> NodeA nodeA = (NodeA)theEObject; T result = caseNodeA(nodeA); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.NODE_B: @@ -157,9 +145,7 @@ public class Model3Switch<T> NodeB nodeB = (NodeB)theEObject; T result = caseNodeB(nodeB); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.NODE_C: @@ -167,9 +153,7 @@ public class Model3Switch<T> NodeC nodeC = (NodeC)theEObject; T result = caseNodeC(nodeC); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.NODE_D: @@ -177,9 +161,7 @@ public class Model3Switch<T> NodeD nodeD = (NodeD)theEObject; T result = caseNodeD(nodeD); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.IMAGE: @@ -187,9 +169,7 @@ public class Model3Switch<T> Image image = (Image)theEObject; T result = caseImage(image); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.FILE: @@ -197,9 +177,7 @@ public class Model3Switch<T> File file = (File)theEObject; T result = caseFile(file); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model3Package.CLASS_WITH_ID_ATTRIBUTE: @@ -207,9 +185,23 @@ public class Model3Switch<T> ClassWithIDAttribute classWithIDAttribute = (ClassWithIDAttribute)theEObject; T result = caseClassWithIDAttribute(classWithIDAttribute); if (result == null) - { result = defaultCase(theEObject); - } + return result; + } + case Model3Package.CLASS_WITH_JAVA_CLASS_ATTRIBUTE: + { + ClassWithJavaClassAttribute classWithJavaClassAttribute = (ClassWithJavaClassAttribute)theEObject; + T result = caseClassWithJavaClassAttribute(classWithJavaClassAttribute); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.CLASS_WITH_JAVA_OBJECT_ATTRIBUTE: + { + ClassWithJavaObjectAttribute classWithJavaObjectAttribute = (ClassWithJavaObjectAttribute)theEObject; + T result = caseClassWithJavaObjectAttribute(classWithJavaObjectAttribute); + if (result == null) + result = defaultCase(theEObject); return result; } default: @@ -218,11 +210,10 @@ public class Model3Switch<T> } /** - * 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 @@ -233,11 +224,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 @@ -248,11 +238,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 @@ -279,11 +268,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 @@ -294,11 +282,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 @@ -309,11 +296,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 @@ -324,11 +310,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 @@ -339,11 +324,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 @@ -354,11 +338,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 @@ -385,12 +368,43 @@ 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 Java Class 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 Java Class Attribute</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClassWithJavaClassAttribute(ClassWithJavaClassAttribute object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Class With Java Object 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 Java Object Attribute</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClassWithJavaObjectAttribute(ClassWithJavaObjectAttribute 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 |