diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3')
49 files changed, 1434 insertions, 306 deletions
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 d455fd0842..7a110d0154 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 @@ -10,13 +10,15 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -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.300", +Export-Package: 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.legacy;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.legacy.impl;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.legacy.util;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.legacy;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl;version="3.0.300", + org.eclipse.emf.cdo.tests.model3.subpackage.legacy.util;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-legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel index 0b84f13f0c..ab9199ff8f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<genmodel:GenModel xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" - modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory="" editorDirectory="" - modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3" updateClasspath="false" - codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" +<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory="" + editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3" + updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes"> <foreignModel>model3.ecore</foreignModel> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables> - <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" + <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true" + metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util" literalsInterface="false" ecorePackage="model3.ecore#/"> <genDataTypes ecoreDataType="model3.ecore#//Point"/> <genClasses ecoreClass="model3.ecore#//Class1"> @@ -61,8 +60,15 @@ <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/> </genClasses> - <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.legacy.model3" - disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage"> + <genClasses ecoreClass="model3.ecore#//ClassWithJavaClassAttribute"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaClassAttribute/javaClass"/> + </genClasses> + <genClasses ecoreClass="model3.ecore#//ClassWithJavaObjectAttribute"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithJavaObjectAttribute/javaObject"/> + </genClasses> + <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3" + disposableProviderFactory="true" metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" + utilityPackageSuffix="legacy.util" ecorePackage="model3.ecore#//subpackage"> <genClasses ecoreClass="model3.ecore#//subpackage/Class2"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//subpackage/Class2/class1"/> 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 efb2779c46..600d236fea 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 @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClass1() * @model * @generated */ @@ -44,7 +44,7 @@ public interface Class1 extends EObject * @return the value of the '<em>Class2</em>' reference list. * @see #isSetClass2() * @see #unsetClass2() - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1_Class2() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClass1_Class2() * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1 * @model opposite="class1" unsettable="true" * @generated 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 1f59ba2b9c..11438c4c0c 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 @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithIDAttribute() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithIDAttribute() * @model * @generated */ @@ -38,7 +38,7 @@ public interface ClassWithIDAttribute extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithIDAttribute_Id() * @model id="true" * @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 index 052a5e2b62..19c9e7b61f 100644 --- 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 @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaClassAttribute() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaClassAttribute() * @model * @generated */ @@ -32,7 +32,7 @@ public interface ClassWithJavaClassAttribute extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaClassAttribute_JavaClass() * @model id="true" * @generated */ 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 index e92ba1cfd9..18aabd05c8 100644 --- 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 @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClassWithJavaObjectAttribute() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaObjectAttribute() * @model * @generated */ @@ -32,7 +32,7 @@ public interface ClassWithJavaObjectAttribute extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getClassWithJavaObjectAttribute_JavaObject() * @model id="true" * @generated */ 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 429a3ea47f..bbb5b6f26f 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 @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getFile() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getFile() * @model * @generated */ @@ -40,7 +40,7 @@ public interface File extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getFile_Name() * @model * @generated */ @@ -66,7 +66,7 @@ public interface File extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getFile_Data() * @model dataType="org.eclipse.emf.cdo.etypes.Clob" * @generated */ 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 f26d52c3fe..6d89a16a1e 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 @@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getImage() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage() * @model * @generated */ @@ -41,7 +41,7 @@ public interface Image extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage_Width() * @model * @generated */ @@ -67,7 +67,7 @@ public interface Image extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage_Height() * @model * @generated */ @@ -93,7 +93,7 @@ public interface Image extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getImage_Data() * @model dataType="org.eclipse.emf.cdo.etypes.Blob" * @generated */ 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 1f33a4a2c7..ab41f926e5 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 @@ -62,7 +62,7 @@ public interface MetaRef extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getMetaRef_EClassRef() * @model * @generated */ @@ -87,7 +87,7 @@ public interface MetaRef extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getMetaRef_EReferenceRef() * @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 6d1faeabd0..5bb40c925b 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 @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeA() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA() * @model * @generated */ @@ -41,7 +41,7 @@ public interface NodeA extends EObject * </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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA_Children() * @model containment="true" * @generated */ @@ -56,7 +56,7 @@ public interface NodeA extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA_Name() * @model * @generated */ @@ -83,7 +83,7 @@ public interface NodeA extends EObject * </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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeA_OtherNodes() * @model * @generated */ 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 4a017b80d1..d2c392e4e3 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 @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeB() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB() * @model * @generated */ @@ -42,7 +42,7 @@ public interface NodeB extends EObject * </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.legacy.Model3Package#getNodeB_Children() * @see org.eclipse.emf.cdo.tests.model3.NodeB#getParent * @model opposite="parent" containment="true" * @generated @@ -60,7 +60,7 @@ public interface NodeB extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB_Parent() * @see org.eclipse.emf.cdo.tests.model3.NodeB#getChildren * @model opposite="children" transient="false" * @generated @@ -85,7 +85,7 @@ public interface NodeB extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeB_Name() * @model * @generated */ 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 c9336c6bb8..06160d755f 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 @@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeC() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC() * @model * @generated */ @@ -44,7 +44,7 @@ public interface NodeC extends EObject * </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.legacy.Model3Package#getNodeC_Children() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getParent * @model opposite="parent" containment="true" * @generated @@ -62,7 +62,7 @@ public interface NodeC extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_Parent() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getChildren * @model opposite="children" transient="false" * @generated @@ -87,7 +87,7 @@ public interface NodeC extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeC_Name() * @model * @generated */ @@ -115,7 +115,7 @@ public interface NodeC extends EObject * </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.legacy.Model3Package#getNodeC_OtherNodes() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOppositeNodes * @model opposite="oppositeNodes" * @generated @@ -133,7 +133,7 @@ public interface NodeC extends EObject * </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.legacy.Model3Package#getNodeC_OppositeNodes() * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes * @model opposite="otherNodes" * @generated 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 99f8ea4eec..476faa9aad 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 @@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getNodeD() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD() * @model * @generated */ @@ -44,7 +44,7 @@ public interface NodeD extends EObject * </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.legacy.Model3Package#getNodeD_Children() * @see org.eclipse.emf.cdo.tests.model3.NodeD#getParent * @model opposite="parent" containment="true" * @generated @@ -62,7 +62,7 @@ public interface NodeD extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_Parent() * @see org.eclipse.emf.cdo.tests.model3.NodeD#getChildren * @model opposite="children" transient="false" * @generated @@ -87,7 +87,7 @@ public interface NodeD extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_Name() * @model * @generated */ @@ -115,7 +115,7 @@ public interface NodeD extends EObject * </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.legacy.Model3Package#getNodeD_OtherNodes() * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode * @model opposite="oppositeNode" * @generated @@ -133,7 +133,7 @@ public interface NodeD extends EObject * <!-- 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getNodeD_OppositeNode() * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes * @model opposite="otherNodes" * @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 d3f1056eee..e9d97dc4db 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 @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygon() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygon() * @model * @generated */ @@ -39,7 +39,7 @@ public interface Polygon extends EObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Points</em>' attribute list. - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygon_Points() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygon_Points() * @model dataType="org.eclipse.emf.cdo.tests.model3.Point" required="true" * @generated */ 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 596f2d89b4..183f3cdf4c 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 @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygonWithDuplicates() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygonWithDuplicates() * @model * @generated */ @@ -40,7 +40,7 @@ public interface PolygonWithDuplicates extends EObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Points</em>' attribute list. - * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getPolygonWithDuplicates_Points() + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package#getPolygonWithDuplicates_Points() * @model unique="false" dataType="org.eclipse.emf.cdo.tests.model3.Point" required="true" * @generated */ 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 139882cb0e..e2c101d3ef 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 @@ -10,6 +10,7 @@ */ package org.eclipse.emf.cdo.tests.model3.impl; +//import org.eclipse.emf.cdo.tests.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; @@ -279,7 +280,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public Point createPointFromString(EDataType eDataType, String initialValue) @@ -289,7 +290,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public String convertPointToString(EDataType eDataType, Object instanceValue) 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 60511d403b..ce903868bf 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 @@ -854,11 +854,11 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** - * Initializes the annotations for <b>teneo.jpa</b>. - * <!-- begin-user-doc --> + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - */ + * @generated + */ protected void createTeneoAnnotations() { String source = "teneo.jpa"; 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/model3/legacy/Model3Factory.java index 479241de64..0970c68a9b 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/model3/legacy/Model3Factory.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3; +package org.eclipse.emf.cdo.tests.model3.legacy; import org.eclipse.emf.cdo.tests.model3.Class1; import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; @@ -23,21 +23,24 @@ import org.eclipse.emf.cdo.tests.model3.NodeC; import org.eclipse.emf.cdo.tests.model3.NodeD; import org.eclipse.emf.cdo.tests.model3.Polygon; import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; +import org.eclipse.emf.ecore.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.legacy.model3.Model3Package + * <!-- begin-user-doc --> + * The <b>Factory</b> for the model. It provides a create method for each non-abstract class of the model. + * @extends org.eclipse.emf.cdo.tests.model3.Model3Factory + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package * @generated */ -public interface Model3Factory extends org.eclipse.emf.cdo.tests.model3.Model3Factory +public interface Model3Factory extends EFactory, org.eclipse.emf.cdo.tests.model3.Model3Factory { /** * 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(); + Model3Factory eINSTANCE = org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3FactoryImpl.init(); /** * Returns a new object of class '<em>Class1</em>'. 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/model3/legacy/Model3Package.java index 7863be4ba8..78070b3b01 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/model3/legacy/Model3Package.java @@ -8,11 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3; +package org.eclipse.emf.cdo.tests.model3.legacy; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; /** @@ -23,12 +24,13 @@ import org.eclipse.emf.ecore.EReference; * <li>each enum,</li> * <li>and each data type</li> * </ul> + * @extends org.eclipse.emf.cdo.tests.model3.Model3Package * <!-- end-user-doc --> - * @see org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Factory * @model kind="package" * @generated */ -public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Package +public interface Model3Package extends EPackage, org.eclipse.emf.cdo.tests.model3.Model3Package { /** * The package name. @@ -39,7 +41,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model3/1.0.0"; @@ -56,13 +58,13 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl.init(); + Model3Package eINSTANCE = org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl <em>Class1</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Class1Impl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getClass1() * @generated */ int CLASS1 = 0; @@ -84,10 +86,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.MetaRefImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getMetaRef() * @generated */ int META_REF = 1; @@ -125,10 +127,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.PolygonImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getPolygon() * @generated */ int POLYGON = 2; @@ -150,10 +152,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.PolygonWithDuplicatesImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getPolygonWithDuplicates() * @generated */ int POLYGON_WITH_DUPLICATES = 3; @@ -176,10 +178,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int POLYGON_WITH_DUPLICATES_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl <em>Node A</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeAImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getNodeA() * @generated */ int NODE_A = 4; @@ -218,10 +220,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_A_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl <em>Node B</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeBImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getNodeB() * @generated */ int NODE_B = 5; @@ -260,10 +262,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_B_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl <em>Node C</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeCImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getNodeC() * @generated */ int NODE_C = 6; @@ -304,7 +306,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * The feature id for the '<em><b>Opposite Nodes</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -319,10 +321,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_C_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl <em>Node D</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeDImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getNodeD() * @generated */ int NODE_D = 7; @@ -377,10 +379,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int NODE_D_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl <em>Image</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.ImageImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getImage() * @generated */ int IMAGE = 8; @@ -418,10 +420,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int IMAGE_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl <em>File</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.FileImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getFile() * @generated */ int FILE = 9; @@ -451,10 +453,10 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.ClassWithIDAttributeImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getClassWithIDAttribute() * @generated */ int CLASS_WITH_ID_ATTRIBUTE = 10; @@ -477,11 +479,11 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa int CLASS_WITH_ID_ATTRIBUTE_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaClassAttributeImpl <em>Class With Java Class Attribute</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.ClassWithJavaClassAttributeImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getClassWithJavaClassAttribute() * @generated */ int CLASS_WITH_JAVA_CLASS_ATTRIBUTE = 11; @@ -505,11 +507,11 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.ClassWithJavaObjectAttributeImpl + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getClassWithJavaObjectAttribute() * @generated */ int CLASS_WITH_JAVA_OBJECT_ATTRIBUTE = 12; @@ -536,7 +538,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa * 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() + * @see org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl#getPoint() * @generated */ int POINT = 13; @@ -544,7 +546,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Class1 <em>Class1</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Class1</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Class1 * @generated @@ -552,10 +554,10 @@ 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>}'. + * 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.legacy.model3.Class1#getClass2() + * @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2() * @see #getClass1() * @generated */ @@ -564,7 +566,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef <em>Meta Ref</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Meta Ref</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.MetaRef * @generated @@ -572,30 +574,30 @@ 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>}'. + * 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.legacy.model3.MetaRef#getEPackageRef() + * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef() * @see #getMetaRef() * @generated */ EReference getMetaRef_EPackageRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEClassRef <em>EClass Ref</em>}'. + * 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.legacy.model3.MetaRef#getEClassRef() + * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEClassRef() * @see #getMetaRef() * @generated */ EReference getMetaRef_EClassRef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef#getEReferenceRef <em>EReference Ref</em>}'. + * 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.legacy.model3.MetaRef#getEReferenceRef() + * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEReferenceRef() * @see #getMetaRef() * @generated */ @@ -604,7 +606,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Polygon <em>Polygon</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Polygon</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Polygon * @generated @@ -612,20 +614,20 @@ 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>}'. + * 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.legacy.model3.Polygon#getPoints() + * @see org.eclipse.emf.cdo.tests.model3.Polygon#getPoints() * @see #getPolygon() * @generated */ EAttribute getPolygon_Points(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates <em>Polygon With Duplicates</em>}'. + * 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.legacy.model3.PolygonWithDuplicates + * @see org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates * @generated */ EClass getPolygonWithDuplicates(); @@ -634,7 +636,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa * Returns the meta object for the attribute list ' * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model3.PolygonWithDuplicates#getPoints() * @see #getPolygonWithDuplicates() @@ -645,7 +647,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA <em>Node A</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Node A</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeA * @generated @@ -653,31 +655,31 @@ 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>}'. + * 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.legacy.model3.NodeA#getChildren() + * @see org.eclipse.emf.cdo.tests.model3.NodeA#getChildren() * @see #getNodeA() * @generated */ EReference getNodeA_Children(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA#getName <em>Name</em>}'. + * 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.legacy.model3.NodeA#getName() + * @see org.eclipse.emf.cdo.tests.model3.NodeA#getName() * @see #getNodeA() * @generated */ 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>}'. + * 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.legacy.model3.NodeA#getOtherNodes() + * @see org.eclipse.emf.cdo.tests.model3.NodeA#getOtherNodes() * @see #getNodeA() * @generated */ @@ -686,7 +688,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB <em>Node B</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Node B</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeB * @generated @@ -694,32 +696,32 @@ 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>}'. + * 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.legacy.model3.NodeB#getChildren() + * @see org.eclipse.emf.cdo.tests.model3.NodeB#getChildren() * @see #getNodeB() * @generated */ EReference getNodeB_Children(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getParent <em>Parent</em>}'. + * 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.legacy.model3.NodeB#getParent() + * @see org.eclipse.emf.cdo.tests.model3.NodeB#getParent() * @see #getNodeB() * @generated */ EReference getNodeB_Parent(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB#getName <em>Name</em>}'. + * 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.legacy.model3.NodeB#getName() + * @see org.eclipse.emf.cdo.tests.model3.NodeB#getName() * @see #getNodeB() * @generated */ @@ -728,7 +730,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC <em>Node C</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Node C</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeC * @generated @@ -736,42 +738,42 @@ 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>}'. + * 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.legacy.model3.NodeC#getChildren() + * @see org.eclipse.emf.cdo.tests.model3.NodeC#getChildren() * @see #getNodeC() * @generated */ EReference getNodeC_Children(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getParent <em>Parent</em>}'. + * 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.legacy.model3.NodeC#getParent() + * @see org.eclipse.emf.cdo.tests.model3.NodeC#getParent() * @see #getNodeC() * @generated */ EReference getNodeC_Parent(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC#getName <em>Name</em>}'. + * 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.legacy.model3.NodeC#getName() + * @see org.eclipse.emf.cdo.tests.model3.NodeC#getName() * @see #getNodeC() * @generated */ 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>}'. + * 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.legacy.model3.NodeC#getOtherNodes() + * @see org.eclipse.emf.cdo.tests.model3.NodeC#getOtherNodes() * @see #getNodeC() * @generated */ @@ -781,7 +783,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model3.NodeC#getOppositeNodes() * @see #getNodeC() @@ -792,7 +794,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD <em>Node D</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Node D</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.NodeD * @generated @@ -800,52 +802,52 @@ 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>}'. + * 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.legacy.model3.NodeD#getChildren() + * @see org.eclipse.emf.cdo.tests.model3.NodeD#getChildren() * @see #getNodeD() * @generated */ EReference getNodeD_Children(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getParent <em>Parent</em>}'. + * 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.legacy.model3.NodeD#getParent() + * @see org.eclipse.emf.cdo.tests.model3.NodeD#getParent() * @see #getNodeD() * @generated */ EReference getNodeD_Parent(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getName <em>Name</em>}'. + * 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.legacy.model3.NodeD#getName() + * @see org.eclipse.emf.cdo.tests.model3.NodeD#getName() * @see #getNodeD() * @generated */ 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>}'. + * 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.legacy.model3.NodeD#getOtherNodes() + * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOtherNodes() * @see #getNodeD() * @generated */ EReference getNodeD_OtherNodes(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD#getOppositeNode <em>Opposite Node</em>}'. + * 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.legacy.model3.NodeD#getOppositeNode() + * @see org.eclipse.emf.cdo.tests.model3.NodeD#getOppositeNode() * @see #getNodeD() * @generated */ @@ -854,7 +856,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image <em>Image</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Image</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.Image * @generated @@ -862,30 +864,30 @@ 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>}'. + * 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.legacy.model3.Image#getWidth() + * @see org.eclipse.emf.cdo.tests.model3.Image#getWidth() * @see #getImage() * @generated */ EAttribute getImage_Width(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getHeight <em>Height</em>}'. + * 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.legacy.model3.Image#getHeight() + * @see org.eclipse.emf.cdo.tests.model3.Image#getHeight() * @see #getImage() * @generated */ EAttribute getImage_Height(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image#getData <em>Data</em>}'. + * 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.legacy.model3.Image#getData() + * @see org.eclipse.emf.cdo.tests.model3.Image#getData() * @see #getImage() * @generated */ @@ -894,7 +896,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.File <em>File</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>File</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model3.File * @generated @@ -902,82 +904,82 @@ 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>}'. + * 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.legacy.model3.File#getName() + * @see org.eclipse.emf.cdo.tests.model3.File#getName() * @see #getFile() * @generated */ EAttribute getFile_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.File#getData <em>Data</em>}'. + * 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.legacy.model3.File#getData() + * @see org.eclipse.emf.cdo.tests.model3.File#getData() * @see #getFile() * @generated */ EAttribute getFile_Data(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute <em>Class With ID Attribute</em>}'. + * 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.legacy.model3.ClassWithIDAttribute + * @see org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute * @generated */ EClass getClassWithIDAttribute(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute#getId <em>Id</em>}'. + * 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.legacy.model3.ClassWithIDAttribute#getId() + * @see org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute#getId() * @see #getClassWithIDAttribute() * @generated */ 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>}'. + * 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.legacy.model3.ClassWithJavaClassAttribute + * @see org.eclipse.emf.cdo.tests.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>}'. + * 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.legacy.model3.ClassWithJavaClassAttribute#getJavaClass() + * @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.legacy.model3.ClassWithJavaObjectAttribute <em>Class With Java Object Attribute</em>}'. + * 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.legacy.model3.ClassWithJavaObjectAttribute + * @see org.eclipse.emf.cdo.tests.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>}'. + * 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.legacy.model3.ClassWithJavaObjectAttribute#getJavaObject() + * @see org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute#getJavaObject() * @see #getClassWithJavaObjectAttribute() * @generated */ @@ -986,7 +988,7 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa /** * Returns the meta object for data type '{@link org.eclipse.emf.cdo.tests.model3.Point <em>Point</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for data type '<em>Point</em>'. * @see org.eclipse.emf.cdo.tests.model3.Point * @model instanceClass="org.eclipse.emf.cdo.tests.model3.Point" 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/model3/legacy/impl/Class1Impl.java index db1ae8de85..9b2e9cded1 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/model3/legacy/impl/Class1Impl.java @@ -8,12 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -30,7 +30,7 @@ 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.model3.legacy.impl.Class1Impl#getClass2 <em>Class2</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/ClassWithIDAttributeImpl.java index 0e0d0e5e4b..e93c7233c0 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/model3/legacy/impl/ClassWithIDAttributeImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -24,7 +24,7 @@ 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.model3.legacy.impl.ClassWithIDAttributeImpl#getId <em>Id</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java index 3704a42a38..132e18caf5 100644 --- 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/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java @@ -1,9 +1,9 @@ /** */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaClassAttributeImpl#getJavaClass <em>Java Class</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.ClassWithJavaClassAttributeImpl#getJavaClass <em>Java Class</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java index 5035a0edc2..b0127465a1 100644 --- 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/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java @@ -1,9 +1,9 @@ /** */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.ClassWithJavaObjectAttribute; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ClassWithJavaObjectAttributeImpl#getJavaObject <em>Java Object</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.ClassWithJavaObjectAttributeImpl#getJavaObject <em>Java Object</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/FileImpl.java index 49d30e44b9..7e2bfa19e3 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/model3/legacy/impl/FileImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; import org.eclipse.emf.cdo.common.lob.CDOClob; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.File; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -24,8 +24,8 @@ 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.model3.legacy.impl.FileImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.FileImpl#getData <em>Data</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/ImageImpl.java index 7c61ba75c2..3d0ecb4f3b 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/model3/legacy/impl/ImageImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; import org.eclipse.emf.cdo.common.lob.CDOBlob; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.Image; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -24,9 +24,9 @@ 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.model3.legacy.impl.ImageImpl#getWidth <em>Width</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.ImageImpl#getHeight <em>Height</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.ImageImpl#getData <em>Data</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/MetaRefImpl.java index 87761a58b5..ad981f0eed 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/model3/legacy/impl/MetaRefImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.MetaRef; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -26,9 +26,9 @@ 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.model3.legacy.impl.MetaRefImpl#getEPackageRef <em>EPackage Ref</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.MetaRefImpl#getEClassRef <em>EClass Ref</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.MetaRefImpl#getEReferenceRef <em>EReference Ref</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/Model3FactoryImpl.java index f8a5405d47..c94be06625 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/model3/legacy/impl/Model3FactoryImpl.java @@ -8,10 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; +//import org.eclipse.emf.cdo.tests.model3.*; import org.eclipse.emf.cdo.tests.model3.Class1; import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute; @@ -26,6 +25,8 @@ import org.eclipse.emf.cdo.tests.model3.NodeD; import org.eclipse.emf.cdo.tests.model3.Point; import org.eclipse.emf.cdo.tests.model3.Polygon; import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Factory; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -42,7 +43,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory { /** * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public static Model3Factory init() @@ -279,7 +280,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public Point createPointFromString(EDataType eDataType, String initialValue) @@ -289,7 +290,7 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public String convertPointToString(EDataType eDataType, Object instanceValue) 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/model3/legacy/impl/Model3PackageImpl.java index e060de1896..af2000949f 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/model3/legacy/impl/Model3PackageImpl.java @@ -8,13 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; import org.eclipse.emf.cdo.etypes.EtypesPackage; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl; import org.eclipse.emf.cdo.tests.model3.Class1; import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute; import org.eclipse.emf.cdo.tests.model3.ClassWithJavaClassAttribute; @@ -29,6 +25,10 @@ import org.eclipse.emf.cdo.tests.model3.NodeD; import org.eclipse.emf.cdo.tests.model3.Point; import org.eclipse.emf.cdo.tests.model3.Polygon; import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Factory; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.SubpackagePackageImpl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -847,6 +847,22 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package // Create resource createResource(eNS_URI); + + // Create annotations + // teneo.jpa + createTeneoAnnotations(); + } + + /** + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void createTeneoAnnotations() + { + String source = "teneo.jpa"; + addAnnotation(pointEDataType, source, new String[] { "value", "@NoAuditing" }); } } // Model3PackageImpl 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/model3/legacy/impl/NodeAImpl.java index a25e0225c5..bf705af0bf 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/model3/legacy/impl/NodeAImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.NodeA; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -31,9 +31,9 @@ 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.model3.legacy.impl.NodeAImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeAImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeAImpl#getOtherNodes <em>Other Nodes</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/NodeBImpl.java index abc331af1b..6b13dbd2be 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/model3/legacy/impl/NodeBImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.NodeB; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -31,9 +31,9 @@ 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.model3.legacy.impl.NodeBImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeBImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeBImpl#getName <em>Name</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/NodeCImpl.java index 565362ed6a..ec8a2557dc 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/model3/legacy/impl/NodeCImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.NodeC; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -32,11 +32,11 @@ 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.model3.legacy.impl.NodeCImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeCImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeCImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeCImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeCImpl#getOppositeNodes <em>Opposite Nodes</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/NodeDImpl.java index f70fd23b1c..da554f7a89 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/model3/legacy/impl/NodeDImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.NodeD; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -32,11 +32,11 @@ 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.model3.legacy.impl.NodeDImpl#getChildren <em>Children</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeDImpl#getParent <em>Parent</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeDImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeDImpl#getOtherNodes <em>Other Nodes</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.NodeDImpl#getOppositeNode <em>Opposite Node</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/PolygonImpl.java index 9817bbf228..064ec58af6 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/model3/legacy/impl/PolygonImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.Point; import org.eclipse.emf.cdo.tests.model3.Polygon; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -26,7 +26,7 @@ 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.model3.legacy.impl.PolygonImpl#getPoints <em>Points</em>}</li> * </ul> * </p> * 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/model3/legacy/impl/PolygonWithDuplicatesImpl.java index 07bc486e8b..202a15da35 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/model3/legacy/impl/PolygonWithDuplicatesImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.impl; +package org.eclipse.emf.cdo.tests.model3.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; import org.eclipse.emf.cdo.tests.model3.Point; import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -27,7 +27,7 @@ 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.model3.legacy.impl.PolygonWithDuplicatesImpl#getPoints <em>Points</em>}</li> * </ul> * </p> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java new file mode 100644 index 0000000000..1675a4fad9 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3AdapterFactory.java @@ -0,0 +1,385 @@ +/** + */ +package org.eclipse.emf.cdo.tests.model3.legacy.util; + +import org.eclipse.emf.cdo.tests.model3.*; + +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- 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.legacy.Model3Package + * @generated + */ +public class Model3AdapterFactory extends AdapterFactoryImpl +{ + /** + * 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 --> + * @generated + */ + public Model3AdapterFactory() + { + if (modelPackage == null) + { + modelPackage = Model3Package.eINSTANCE; + } + } + + /** + * 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 + */ + @Override + public boolean isFactoryForType(Object object) + { + if (object == modelPackage) + { + return true; + } + if (object instanceof EObject) + { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Model3Switch<Adapter> modelSwitch = new Model3Switch<Adapter>() + { + @Override + public Adapter caseClass1(Class1 object) + { + return createClass1Adapter(); + } + + @Override + public Adapter caseMetaRef(MetaRef object) + { + return createMetaRefAdapter(); + } + + @Override + public Adapter casePolygon(Polygon object) + { + return createPolygonAdapter(); + } + + @Override + public Adapter casePolygonWithDuplicates(PolygonWithDuplicates object) + { + return createPolygonWithDuplicatesAdapter(); + } + + @Override + public Adapter caseNodeA(NodeA object) + { + return createNodeAAdapter(); + } + + @Override + public Adapter caseNodeB(NodeB object) + { + return createNodeBAdapter(); + } + + @Override + public Adapter caseNodeC(NodeC object) + { + return createNodeCAdapter(); + } + + @Override + public Adapter caseNodeD(NodeD object) + { + return createNodeDAdapter(); + } + + @Override + public Adapter caseImage(Image object) + { + return createImageAdapter(); + } + + @Override + public Adapter caseFile(File object) + { + return createFileAdapter(); + } + + @Override + public Adapter caseClassWithIDAttribute(ClassWithIDAttribute object) + { + return createClassWithIDAttributeAdapter(); + } + + @Override + public Adapter caseClassWithJavaClassAttribute(ClassWithJavaClassAttribute object) + { + return createClassWithJavaClassAttributeAdapter(); + } + + @Override + public Adapter caseClassWithJavaObjectAttribute(ClassWithJavaObjectAttribute object) + { + return createClassWithJavaObjectAttributeAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) + { + return createEObjectAdapter(); + } + }; + + /** + * 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 + */ + @Override + public Adapter createAdapter(Notifier target) + { + return modelSwitch.doSwitch((EObject)target); + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.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 + */ + public Adapter createClass1Adapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createMetaRefAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createPolygonAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createPolygonWithDuplicatesAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeA <em>Node A</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.NodeA + * @generated + */ + public Adapter createNodeAAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeB <em>Node B</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.NodeB + * @generated + */ + public Adapter createNodeBAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeC <em>Node C</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.NodeC + * @generated + */ + public Adapter createNodeCAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeD <em>Node D</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.NodeD + * @generated + */ + public Adapter createNodeDAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.Image <em>Image</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.Image + * @generated + */ + public Adapter createImageAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.File <em>File</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.File + * @generated + */ + public Adapter createFileAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute <em>Class With ID Attribute</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute + * @generated + */ + public Adapter createClassWithIDAttributeAdapter() + { + return null; + } + + /** + * Creates a new adapter for 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 + */ + public Adapter createEObjectAdapter() + { + return null; + } + +} //Model3AdapterFactory diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java new file mode 100644 index 0000000000..0689bc3b4e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/util/Model3Switch.java @@ -0,0 +1,427 @@ +/** + */ +package org.eclipse.emf.cdo.tests.model3.legacy.util; + +import java.util.List; + +import org.eclipse.emf.cdo.tests.model3.*; + +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * The <b>Switch</b> for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the <code>caseXXX</code> method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.legacy.Model3Package + * @generated + */ +public class Model3Switch<T> +{ + /** + * 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 --> + * @generated + */ + public Model3Switch() + { + if (modelPackage == null) + { + modelPackage = Model3Package.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + public T doSwitch(EObject theEObject) + { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(EClass theEClass, EObject theEObject) + { + if (theEClass.eContainer() == modelPackage) + { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else + { + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(int classifierID, EObject theEObject) + { + switch (classifierID) + { + case Model3Package.CLASS1: + { + Class1 class1 = (Class1)theEObject; + T result = caseClass1(class1); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.META_REF: + { + MetaRef metaRef = (MetaRef)theEObject; + T result = caseMetaRef(metaRef); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.POLYGON: + { + Polygon polygon = (Polygon)theEObject; + T result = casePolygon(polygon); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.POLYGON_WITH_DUPLICATES: + { + PolygonWithDuplicates polygonWithDuplicates = (PolygonWithDuplicates)theEObject; + T result = casePolygonWithDuplicates(polygonWithDuplicates); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.NODE_A: + { + NodeA nodeA = (NodeA)theEObject; + T result = caseNodeA(nodeA); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.NODE_B: + { + NodeB nodeB = (NodeB)theEObject; + T result = caseNodeB(nodeB); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.NODE_C: + { + NodeC nodeC = (NodeC)theEObject; + T result = caseNodeC(nodeC); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.NODE_D: + { + NodeD nodeD = (NodeD)theEObject; + T result = caseNodeD(nodeD); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.IMAGE: + { + Image image = (Image)theEObject; + T result = caseImage(image); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.FILE: + { + File file = (File)theEObject; + T result = caseFile(file); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model3Package.CLASS_WITH_ID_ATTRIBUTE: + { + ClassWithIDAttribute classWithIDAttribute = (ClassWithIDAttribute)theEObject; + T result = caseClassWithIDAttribute(classWithIDAttribute); + if (result == null) + result = defaultCase(theEObject); + return result; + } + 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: + return defaultCase(theEObject); + } + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Class1</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClass1(Class1 object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseMetaRef(MetaRef object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Polygon</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T casePolygon(Polygon object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Polygon With Duplicates</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>Polygon With Duplicates</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T casePolygonWithDuplicates(PolygonWithDuplicates object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseNodeA(NodeA object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseNodeB(NodeB object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseNodeC(NodeC object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseNodeD(NodeD object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Image</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseImage(Image object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>File</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseFile(File object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClassWithIDAttribute(ClassWithIDAttribute object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>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. + * @return the result of interpreting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + public T defaultCase(EObject object) + { + return null; + } + +} //Model3Switch 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 9890c418bc..532e2ec44d 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 @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EObject; * </ul> * </p> * - * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage#getClass2() + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage#getClass2() * @model * @generated */ @@ -42,7 +42,7 @@ public interface Class2 extends EObject * </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.subpackage.legacy.SubpackagePackage#getClass2_Class1() * @see org.eclipse.emf.cdo.tests.model3.Class1#getClass2 * @model opposite="class2" * @generated 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 931f4704cb..58397aca74 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 @@ -4,12 +4,13 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model3.subpackage.impl; +//import org.eclipse.emf.cdo.tests.model3.subpackage.*; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory; import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage; 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/model3/subpackage/legacy/SubpackageFactory.java index bbd13e651d..731900f6b5 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/model3/subpackage/legacy/SubpackageFactory.java @@ -8,24 +8,27 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.subpackage; +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; +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.legacy.model3.subpackage.SubpackagePackage + * <!-- begin-user-doc --> + * The <b>Factory</b> for the model. It provides a create method for each non-abstract class of the model. + * @extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage * @generated */ -public interface SubpackageFactory extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory +public interface SubpackageFactory extends EFactory, org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory { /** * 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(); + SubpackageFactory eINSTANCE = org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.SubpackageFactoryImpl.init(); /** * Returns a new object of class '<em>Class2</em>'. 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/model3/subpackage/legacy/SubpackagePackage.java index bb87ce4933..879a0ef263 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/model3/subpackage/legacy/SubpackagePackage.java @@ -8,9 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.subpackage; +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; /** @@ -21,12 +22,13 @@ import org.eclipse.emf.ecore.EReference; * <li>each enum,</li> * <li>and each data type</li> * </ul> + * @extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage * <!-- end-user-doc --> - * @see org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackageFactory * @model kind="package" * @generated */ -public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage +public interface SubpackagePackage extends EPackage, org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage { /** * The package name. @@ -37,7 +39,7 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/subpackage/1.0.0"; @@ -54,13 +56,13 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.SubpackagePackageImpl.init(); + SubpackagePackage eINSTANCE = org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.SubpackagePackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl <em>Class2</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.Class2Impl + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.SubpackagePackageImpl#getClass2() * @generated */ int CLASS2 = 0; @@ -82,20 +84,20 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp int CLASS2_FEATURE_COUNT = 1; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2 <em>Class2</em>}'. + * 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.legacy.model3.subpackage.Class2 + * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2 * @generated */ EClass getClass2(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.Class2#getClass1 <em>Class1</em>}'. + * 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.legacy.model3.subpackage.Class2#getClass1() + * @see org.eclipse.emf.cdo.tests.model3.subpackage.Class2#getClass1() * @see #getClass2() * @generated */ @@ -123,10 +125,10 @@ public interface SubpackagePackage extends org.eclipse.emf.cdo.tests.model3.subp interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl.Class2Impl <em>Class2</em>}' class. + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.subpackage.legacy.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() + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.Class2Impl + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl.SubpackagePackageImpl#getClass2() * @generated */ EClass CLASS2 = eINSTANCE.getClass2(); 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/model3/subpackage/legacy/impl/Class2Impl.java index d8426de7d7..f1c517aafb 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/model3/subpackage/legacy/impl/Class2Impl.java @@ -8,12 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl; +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; import org.eclipse.emf.cdo.tests.model3.Class1; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -30,7 +30,7 @@ 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.model3.subpackage.legacy.impl.Class2Impl#getClass1 <em>Class1</em>}</li> * </ul> * </p> * 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/model3/subpackage/legacy/impl/SubpackageFactoryImpl.java index ab85c53c64..445be5278c 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/model3/subpackage/legacy/impl/SubpackageFactoryImpl.java @@ -8,11 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl; +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; +//import org.eclipse.emf.cdo.tests.model3.subpackage.*; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackageFactory; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; @@ -28,7 +29,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac { /** * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public static SubpackageFactory init() 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/model3/subpackage/legacy/impl/SubpackagePackageImpl.java index 3e286f86b7..68d7c7ed9f 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/model3/subpackage/legacy/impl/SubpackagePackageImpl.java @@ -8,14 +8,14 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl; +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy.impl; import org.eclipse.emf.cdo.etypes.EtypesPackage; -import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package; -import org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory; -import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage; +import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; +import org.eclipse.emf.cdo.tests.model3.legacy.impl.Model3PackageImpl; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackageFactory; +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java new file mode 100644 index 0000000000..2c3e39f352 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageAdapterFactory.java @@ -0,0 +1,133 @@ +/** + */ +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy.util; + +import org.eclipse.emf.cdo.tests.model3.subpackage.*; + +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- 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.legacy.SubpackagePackage + * @generated + */ +public class SubpackageAdapterFactory extends AdapterFactoryImpl +{ + /** + * 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 --> + * @generated + */ + public SubpackageAdapterFactory() + { + if (modelPackage == null) + { + modelPackage = SubpackagePackage.eINSTANCE; + } + } + + /** + * 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 + */ + @Override + public boolean isFactoryForType(Object object) + { + if (object == modelPackage) + { + return true; + } + if (object instanceof EObject) + { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>() + { + @Override + public Adapter caseClass2(Class2 object) + { + return createClass2Adapter(); + } + + @Override + public Adapter defaultCase(EObject object) + { + return createEObjectAdapter(); + } + }; + + /** + * 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 + */ + @Override + public Adapter createAdapter(Notifier target) + { + return modelSwitch.doSwitch((EObject)target); + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.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 + */ + public Adapter createClass2Adapter() + { + 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 + */ + public Adapter createEObjectAdapter() + { + return null; + } + +} //SubpackageAdapterFactory diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java new file mode 100644 index 0000000000..4409545328 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/util/SubpackageSwitch.java @@ -0,0 +1,139 @@ +/** + */ +package org.eclipse.emf.cdo.tests.model3.subpackage.legacy.util; + +import java.util.List; + +import org.eclipse.emf.cdo.tests.model3.subpackage.*; + +import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * The <b>Switch</b> for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the <code>caseXXX</code> method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage + * @generated + */ +public class SubpackageSwitch<T> +{ + /** + * 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 --> + * @generated + */ + public SubpackageSwitch() + { + if (modelPackage == null) + { + modelPackage = SubpackagePackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + public T doSwitch(EObject theEObject) + { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(EClass theEClass, EObject theEObject) + { + if (theEClass.eContainer() == modelPackage) + { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else + { + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(int classifierID, EObject theEObject) + { + switch (classifierID) + { + case SubpackagePackage.CLASS2: + { + Class2 class2 = (Class2)theEObject; + T result = caseClass2(class2); + if (result == null) + result = defaultCase(theEObject); + return result; + } + default: + return defaultCase(theEObject); + } + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Class2</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseClass2(Class2 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. + * @return the result of interpreting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + public T defaultCase(EObject object) + { + return null; + } + +} //SubpackageSwitch 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 3803960273..7dbd0dac94 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 @@ -4,12 +4,13 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model3.subpackage.util; +//import org.eclipse.emf.cdo.tests.model3.subpackage.*; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage; 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 3f6252e0dd..47e9eb9ead 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -18,6 +18,8 @@ import org.eclipse.emf.ecore.EObject; import java.util.List; +//import org.eclipse.emf.cdo.tests.model3.subpackage.*; + /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, 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 1b1271ea1c..ec27835933 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 @@ -4,12 +4,13 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model3.util; +//import org.eclipse.emf.cdo.tests.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; @@ -242,7 +243,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeA <em>Node A</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.NodeA * @generated @@ -256,7 +257,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeB <em>Node B</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.NodeB * @generated @@ -270,7 +271,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeC <em>Node C</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.NodeC * @generated @@ -284,7 +285,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.NodeD <em>Node D</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.NodeD * @generated @@ -298,7 +299,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.Image <em>Image</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.Image * @generated @@ -312,7 +313,7 @@ public class Model3AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model3.File <em>File</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * + * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model3.File * @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 918a44b784..fa67dbe4f1 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -30,6 +30,8 @@ import org.eclipse.emf.ecore.EObject; import java.util.List; +//import org.eclipse.emf.cdo.tests.model3.*; + /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, @@ -255,7 +257,7 @@ public class Model3Switch<T> * Returns the result of interpreting the object as an instance of '<em>Polygon With Duplicates</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>Polygon With Duplicates</em>'. @@ -355,7 +357,7 @@ public class Model3Switch<T> * Returns the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> - * + * * @param object * the target of the switch. * @return the result of interpreting the object as an instance of '<em>Class With ID Attribute</em>'. |