From 8a4ddd6e9ad7206180607c0a3f18e9ca2fc0bbdb Mon Sep 17 00:00:00 2001 From: Martin Fluegge Date: Tue, 22 Feb 2011 21:38:54 +0000 Subject: [335669] Remove LITERALS constant from CDO test models https://bugs.eclipse.org/bugs/show_bug.cgi?id=335669 --- .../model/interfaces.genmodel | 2 +- .../model/interfaces.legacy-genmodel | 108 ++++++--- .../impl/model4interfacesPackageImpl.java | 80 +++--- .../model4interfaces/model4interfacesPackage.java | 267 --------------------- .../util/model4interfacesSwitch.java | 28 --- .../impl/model4interfacesPackageImpl.java | 80 +++--- .../model4interfaces/model4interfacesPackage.java | 260 -------------------- .../util/model4interfacesSwitch.java | 28 --- 8 files changed, 148 insertions(+), 705 deletions(-) (limited to 'plugins/org.eclipse.emf.cdo.tests.model4interfaces') diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel index 62dce20299..e06e8320b8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel @@ -11,7 +11,7 @@ interfaces.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" ecorePackage="interfaces.ecore#/"> diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel index ec04321e4f..b50c546cda 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel @@ -1,55 +1,89 @@ - + interfaces.ecore CDO=org.eclipse.emf.cdo - - - + + + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - - + + - - + + + + + - - + + + + + - - + + + + + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java index 20e48f201a..4a2ef98aa5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java @@ -178,9 +178,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public static model4interfacesPackage init() { if (isInited) - { return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI); - } // Obtain or create and register package model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE @@ -499,9 +497,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -563,9 +559,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -582,57 +576,59 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i // Initialize classes and features; add operations and parameters initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), - getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, + initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(), + this.getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(), - "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(), + this.getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(), - getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), + this.getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(), - getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), + this.getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), - getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, + initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), + this.getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(), - "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(), + this.getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(), - getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), + this.getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(), - getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), + this.getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -644,26 +640,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, - 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null, + 0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, - 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", + null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, - -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, - 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java index 3ae024ed18..4538aae6f2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java @@ -744,271 +744,4 @@ public interface model4interfacesPackage extends org.eclipse.emf.cdo.tests.model */ model4interfacesFactory getmodel4interfacesFactory(); - /** - * Defines literals for the meta objects that represent - * - * - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer - * ISingle Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainer() - * @generated - */ - EClass ISINGLE_REF_CONTAINER = eINSTANCE.getISingleRefContainer(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER__ELEMENT = eINSTANCE.getISingleRefContainer_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement - * ISingle Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainedElement() - * @generated - */ - EClass ISINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getISingleRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer - * ISingle Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainer() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER = eINSTANCE.getISingleRefNonContainer(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER__ELEMENT = eINSTANCE.getISingleRefNonContainer_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement - * ISingle Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainedElement() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getISingleRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer - * IMulti Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainer() - * @generated - */ - EClass IMULTI_REF_CONTAINER = eINSTANCE.getIMultiRefContainer(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefContainer_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement - * IMulti Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainedElement() - * @generated - */ - EClass IMULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference IMULTI_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer - * IMulti Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainer() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER = eINSTANCE.getIMultiRefNonContainer(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefNonContainer_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement - * IMulti Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainedElement() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement - * INamed Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getINamedElement() - * @generated - */ - EClass INAMED_ELEMENT = eINSTANCE.getINamedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute INAMED_ELEMENT__NAME = eINSTANCE.getINamedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink - * IContained Element No Parent Link}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIContainedElementNoParentLink() - * @generated - */ - EClass ICONTAINED_ELEMENT_NO_PARENT_LINK = eINSTANCE.getIContainedElementNoParentLink(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL - * ISingle Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainerNPL() - * @generated - */ - EClass ISINGLE_REF_CONTAINER_NPL = eINSTANCE.getISingleRefContainerNPL(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefContainerNPL_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL - * ISingle Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainerNPL() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getISingleRefNonContainerNPL(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefNonContainerNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL - * IMulti Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainerNPL() - * @generated - */ - EClass IMULTI_REF_CONTAINER_NPL = eINSTANCE.getIMultiRefContainerNPL(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefContainerNPL_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL - * IMulti Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainerNPL() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getIMultiRefNonContainerNPL(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefNonContainerNPL_Elements(); - - } - } // model4interfacesPackage diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java index 3b161d8b95..e444fa000f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java @@ -110,9 +110,7 @@ public class model4interfacesSwitch ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject; T result = caseISingleRefContainer(iSingleRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT: @@ -120,9 +118,7 @@ public class model4interfacesSwitch ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject; T result = caseISingleRefContainedElement(iSingleRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER: @@ -130,9 +126,7 @@ public class model4interfacesSwitch ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject; T result = caseISingleRefNonContainer(iSingleRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT: @@ -140,9 +134,7 @@ public class model4interfacesSwitch ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: @@ -150,9 +142,7 @@ public class model4interfacesSwitch IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject; T result = caseIMultiRefContainer(iMultiRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT: @@ -160,9 +150,7 @@ public class model4interfacesSwitch IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject; T result = caseIMultiRefContainedElement(iMultiRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER: @@ -170,9 +158,7 @@ public class model4interfacesSwitch IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject; T result = caseIMultiRefNonContainer(iMultiRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT: @@ -180,9 +166,7 @@ public class model4interfacesSwitch IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.INAMED_ELEMENT: @@ -190,9 +174,7 @@ public class model4interfacesSwitch INamedElement iNamedElement = (INamedElement)theEObject; T result = caseINamedElement(iNamedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK: @@ -200,9 +182,7 @@ public class model4interfacesSwitch IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject; T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL: @@ -210,9 +190,7 @@ public class model4interfacesSwitch ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject; T result = caseISingleRefContainerNPL(iSingleRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL: @@ -220,9 +198,7 @@ public class model4interfacesSwitch ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject; T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL: @@ -230,9 +206,7 @@ public class model4interfacesSwitch IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject; T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL: @@ -240,9 +214,7 @@ public class model4interfacesSwitch IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject; T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java index d7986eb361..272c712386 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java @@ -178,9 +178,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public static model4interfacesPackage init() { if (isInited) - { return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI); - } // Obtain or create and register package model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE @@ -499,9 +497,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -563,9 +559,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -582,57 +576,59 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i // Initialize classes and features; add operations and parameters initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), - getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, + initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(), + this.getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(), - "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(), + this.getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(), - getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), + this.getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(), - getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), + this.getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), - getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, + initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), + this.getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(), - "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(), + this.getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(), - getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), + this.getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(), - getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), + this.getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -644,26 +640,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, - 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null, + 0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, - 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", + null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, - -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, - 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java index 92f3ce5c66..048cb9004e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java @@ -737,264 +737,4 @@ public interface model4interfacesPackage extends EPackage */ model4interfacesFactory getmodel4interfacesFactory(); - /** - * Defines literals for the meta objects that represent - *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • - *
- * - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer - * ISingle Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainer() - * @generated - */ - EClass ISINGLE_REF_CONTAINER = eINSTANCE.getISingleRefContainer(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER__ELEMENT = eINSTANCE.getISingleRefContainer_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement - * ISingle Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainedElement() - * @generated - */ - EClass ISINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getISingleRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer - * ISingle Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainer() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER = eINSTANCE.getISingleRefNonContainer(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER__ELEMENT = eINSTANCE.getISingleRefNonContainer_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement - * ISingle Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainedElement() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getISingleRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer - * IMulti Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainer() - * @generated - */ - EClass IMULTI_REF_CONTAINER = eINSTANCE.getIMultiRefContainer(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefContainer_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement - * IMulti Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainedElement() - * @generated - */ - EClass IMULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference IMULTI_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer - * IMulti Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainer() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER = eINSTANCE.getIMultiRefNonContainer(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefNonContainer_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement - * IMulti Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainedElement() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement - * INamed Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getINamedElement() - * @generated - */ - EClass INAMED_ELEMENT = eINSTANCE.getINamedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute INAMED_ELEMENT__NAME = eINSTANCE.getINamedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink - * IContained Element No Parent Link}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIContainedElementNoParentLink() - * @generated - */ - EClass ICONTAINED_ELEMENT_NO_PARENT_LINK = eINSTANCE.getIContainedElementNoParentLink(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL - * ISingle Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainerNPL() - * @generated - */ - EClass ISINGLE_REF_CONTAINER_NPL = eINSTANCE.getISingleRefContainerNPL(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefContainerNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL - * ISingle Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainerNPL() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getISingleRefNonContainerNPL(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefNonContainerNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL - * IMulti Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainerNPL() - * @generated - */ - EClass IMULTI_REF_CONTAINER_NPL = eINSTANCE.getIMultiRefContainerNPL(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefContainerNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL - * IMulti Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainerNPL() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getIMultiRefNonContainerNPL(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefNonContainerNPL_Elements(); - - } - } // model4interfacesPackage diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java index 72eba867fa..f38a4631fa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java @@ -110,9 +110,7 @@ public class model4interfacesSwitch ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject; T result = caseISingleRefContainer(iSingleRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT: @@ -120,9 +118,7 @@ public class model4interfacesSwitch ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject; T result = caseISingleRefContainedElement(iSingleRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER: @@ -130,9 +126,7 @@ public class model4interfacesSwitch ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject; T result = caseISingleRefNonContainer(iSingleRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT: @@ -140,9 +134,7 @@ public class model4interfacesSwitch ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: @@ -150,9 +142,7 @@ public class model4interfacesSwitch IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject; T result = caseIMultiRefContainer(iMultiRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT: @@ -160,9 +150,7 @@ public class model4interfacesSwitch IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject; T result = caseIMultiRefContainedElement(iMultiRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER: @@ -170,9 +158,7 @@ public class model4interfacesSwitch IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject; T result = caseIMultiRefNonContainer(iMultiRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT: @@ -180,9 +166,7 @@ public class model4interfacesSwitch IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.INAMED_ELEMENT: @@ -190,9 +174,7 @@ public class model4interfacesSwitch INamedElement iNamedElement = (INamedElement)theEObject; T result = caseINamedElement(iNamedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK: @@ -200,9 +182,7 @@ public class model4interfacesSwitch IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject; T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL: @@ -210,9 +190,7 @@ public class model4interfacesSwitch ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject; T result = caseISingleRefContainerNPL(iSingleRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL: @@ -220,9 +198,7 @@ public class model4interfacesSwitch ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject; T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL: @@ -230,9 +206,7 @@ public class model4interfacesSwitch IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject; T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL: @@ -240,9 +214,7 @@ public class model4interfacesSwitch IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject; T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: -- cgit v1.2.3