From 9945444baa1a2cb3c7a49859b9845567d527a1fd Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Fri, 5 Feb 2010 10:41:53 +0000 Subject: fixed warnings --- .../eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java | 4 + .../emf/cdo/defs/impl/CDODefsFactoryImpl.java | 2 + .../emf/cdo/defs/impl/CDODefsPackageImpl.java | 38 ++++---- .../emf/cdo/defs/impl/CDOResourceDefImpl.java | 12 +++ .../emf/cdo/defs/impl/CDOSessionDefImpl.java | 28 ++++++ .../eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java | 6 ++ .../emf/cdo/defs/impl/EDynamicPackageDefImpl.java | 4 + .../eclipse/emf/cdo/defs/impl/EPackageDefImpl.java | 4 + .../emf/cdo/defs/impl/FailOverStrategyDefImpl.java | 6 ++ .../defs/impl/RetryFailOverStrategyDefImpl.java | 10 ++ .../eclipse/emf/cdo/defs/util/CDODefsSwitch.java | 74 ++++++++++++++ .../EresourceItemProviderAdapterFactory.java | 6 +- .../CompanyItemProviderAdapterFactory.java | 24 ++++- .../examples/company/impl/CompanyFactoryImpl.java | 2 + .../examples/company/impl/CompanyPackageImpl.java | 90 +++++++++-------- .../cdo/examples/company/util/CompanySwitch.java | 38 ++++++++ .../tests/legacy/mango/impl/MangoFactoryImpl.java | 2 + .../tests/legacy/mango/impl/MangoPackageImpl.java | 13 ++- .../legacy/mango/impl/MangoParameterImpl.java | 6 ++ .../tests/legacy/mango/impl/MangoValueImpl.java | 4 + .../legacy/mango/impl/MangoValueListImpl.java | 4 + .../emf/cdo/tests/mango/impl/MangoFactoryImpl.java | 2 + .../emf/cdo/tests/mango/impl/MangoPackageImpl.java | 13 ++- .../emf/cdo/tests/mango/util/MangoSwitch.java | 6 ++ .../cdo/tests/model1/impl/Model1FactoryImpl.java | 2 + .../cdo/tests/model1/impl/Model1PackageImpl.java | 102 ++++++++++---------- .../cdo/tests/model1/impl/ProductToOrderImpl.java | 2 +- .../emf/cdo/tests/model1/util/Model1Switch.java | 40 ++++++++ .../legacy/model2/impl/Model2PackageImpl.java | 28 +++--- .../model2/impl/PersistentContainmentImpl.java | 6 ++ .../model2/impl/SpecialPurchaseOrderImpl.java | 16 ++++ .../emf/cdo/tests/legacy/model2/impl/TaskImpl.java | 24 ++++- .../legacy/model2/impl/TransientContainerImpl.java | 24 ++++- .../tests/legacy/model2/impl/Unsettable1Impl.java | 90 +++++++++++++++++ .../model2/impl/Unsettable2WithDefaultImpl.java | 90 +++++++++++++++++ .../cdo/tests/legacy/model2/util/Model2Switch.java | 18 ++++ .../cdo/tests/model2/impl/Model2PackageImpl.java | 28 +++--- .../emf/cdo/tests/model2/util/Model2Switch.java | 18 ++++ .../cdo/tests/legacy/model3/impl/Class1Impl.java | 2 + .../cdo/tests/legacy/model3/impl/MetaRefImpl.java | 6 ++ .../legacy/model3/impl/Model3PackageImpl.java | 6 ++ .../subpackage/impl/SubpackagePackageImpl.java | 6 ++ .../model3/subpackage/util/SubpackageSwitch.java | 2 + .../cdo/tests/legacy/model3/util/Model3Switch.java | 4 + .../cdo/tests/model3/impl/Model3PackageImpl.java | 6 ++ .../subpackage/impl/SubpackagePackageImpl.java | 6 ++ .../model3/subpackage/util/SubpackageSwitch.java | 2 + .../emf/cdo/tests/model3/util/Model3Switch.java | 4 + .../impl/ContainedElementNoOppositeImpl.java | 4 + .../model4/impl/GenRefMapNonContainedImpl.java | 4 + .../model4/impl/GenRefSingleContainedImpl.java | 12 +++ .../model4/impl/GenRefSingleNonContainedImpl.java | 6 ++ .../model4/impl/ImplContainedElementNPLImpl.java | 4 + .../impl/ImplMultiRefContainedElementImpl.java | 20 +++- .../impl/ImplMultiRefNonContainedElementImpl.java | 22 +++++ .../impl/ImplSingleRefContainedElementImpl.java | 20 +++- .../model4/impl/ImplSingleRefContainerImpl.java | 14 +++ .../model4/impl/ImplSingleRefContainerNPLImpl.java | 12 +++ .../impl/ImplSingleRefNonContainedElementImpl.java | 22 +++++ .../model4/impl/ImplSingleRefNonContainerImpl.java | 18 ++++ .../impl/ImplSingleRefNonContainerNPLImpl.java | 6 ++ .../model4/impl/MultiContainedElementImpl.java | 22 ++++- .../model4/impl/MultiNonContainedElementImpl.java | 22 +++++ .../MultiNonContainedUnsettableElementImpl.java | 30 ++++++ .../impl/RefMultiNonContainedUnsettableImpl.java | 2 + .../legacy/model4/impl/RefSingleContainedImpl.java | 14 +++ .../model4/impl/RefSingleContainedNPLImpl.java | 12 +++ .../model4/impl/RefSingleNonContainedImpl.java | 18 ++++ .../model4/impl/RefSingleNonContainedNPLImpl.java | 6 ++ .../model4/impl/SingleContainedElementImpl.java | 22 ++++- .../model4/impl/SingleNonContainedElementImpl.java | 22 +++++ .../legacy/model4/impl/StringToEObjectImpl.java | 8 +- .../legacy/model4/impl/model4PackageImpl.java | 81 ++++++++-------- .../cdo/tests/legacy/model4/util/model4Switch.java | 98 +++++++++++++++++++ .../cdo/tests/model4/impl/StringToEObjectImpl.java | 2 +- .../cdo/tests/model4/impl/model4PackageImpl.java | 81 ++++++++-------- .../emf/cdo/tests/model4/util/model4Switch.java | 98 +++++++++++++++++++ .../impl/model4interfacesPackageImpl.java | 64 +++++++------ .../util/model4interfacesSwitch.java | 28 ++++++ .../impl/model4interfacesPackageImpl.java | 64 +++++++------ .../util/model4interfacesSwitch.java | 28 ++++++ .../legacy/model5/impl/GenListOfBooleanImpl.java | 2 + .../legacy/model5/impl/GenListOfCharImpl.java | 2 + .../legacy/model5/impl/GenListOfDateImpl.java | 2 + .../legacy/model5/impl/GenListOfDoubleImpl.java | 2 + .../legacy/model5/impl/GenListOfFloatImpl.java | 2 + .../tests/legacy/model5/impl/GenListOfIntImpl.java | 2 + .../legacy/model5/impl/GenListOfIntegerImpl.java | 2 + .../legacy/model5/impl/GenListOfLongImpl.java | 2 + .../legacy/model5/impl/GenListOfShortImpl.java | 2 + .../legacy/model5/impl/GenListOfStringImpl.java | 2 + .../legacy/model5/impl/Model5PackageImpl.java | 14 ++- .../legacy/model5/impl/TestFeatureMapImpl.java | 4 + .../cdo/tests/legacy/model5/util/Model5Switch.java | 26 +++++ .../cdo/tests/model5/impl/Model5PackageImpl.java | 14 ++- .../emf/cdo/tests/model5/util/Model5Switch.java | 26 +++++ .../model/base/impl/BasePackageImpl.java | 6 ++ .../model/base/util/BaseSwitch.java | 2 + .../model/derived/impl/DerivedPackageImpl.java | 6 ++ .../model/derived/util/DerivedSwitch.java | 4 + .../interface_/impl/InterfacePackageImpl.java | 6 ++ .../model/interface_/util/InterfaceSwitch.java | 2 + .../model/reference/impl/ReferencePackageImpl.java | 6 ++ .../model/reference/util/ReferenceSwitch.java | 2 + .../eclipse/emf/cdo/tests/CrossReferenceTest.java | 4 +- .../bugzilla/Bugzilla_283985_SavePointTest.java | 2 +- .../emf/cdo/ui/defs/impl/CDOEditorDefImpl.java | 10 ++ .../emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java | 8 +- .../emf/cdo/ui/defs/impl/EditorDefImpl.java | 4 + .../emf/cdo/ui/defs/util/CDOUIDefsSwitch.java | 10 ++ .../cdo/eresource/impl/EresourcePackageImpl.java | 26 +++-- .../eclipse/net4j/defs/impl/AcceptorDefImpl.java | 22 +++++ .../eclipse/net4j/defs/impl/ConnectorDefImpl.java | 32 +++++++ .../net4j/defs/impl/HTTPConnectorDefImpl.java | 4 + .../net4j/defs/impl/JVMAcceptorDefImpl.java | 4 + .../net4j/defs/impl/JVMConnectorDefImpl.java | 4 + .../net4j/defs/impl/Net4jDefsPackageImpl.java | 34 ++++--- .../net4j/defs/impl/TCPAcceptorDefImpl.java | 12 +++ .../net4j/defs/impl/TCPConnectorDefImpl.java | 18 ++++ .../eclipse/net4j/defs/util/Net4jDefsSwitch.java | 68 +++++++++++++ plugins/org.eclipse.net4j.tests/.classpath | 22 +---- .../net4j/util/tests/defs/impl/TestDefImpl.java | 4 + .../util/tests/defs/impl/TestDefsPackageImpl.java | 6 ++ .../net4j/util/tests/defs/util/TestDefsSwitch.java | 4 + .../net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java | 6 ++ .../net4j/ui/defs/util/Net4JUIDefsSwitch.java | 4 + .../util/defs/impl/ChallengeNegotiatorDefImpl.java | 12 +++ .../util/defs/impl/CredentialsProviderDefImpl.java | 4 + .../net4j/util/defs/impl/DefContainerImpl.java | 6 ++ .../util/defs/impl/Net4jUtilDefsPackageImpl.java | 40 ++++---- .../impl/PasswordCredentialsProviderDefImpl.java | 4 + .../net4j/util/defs/impl/RandomizerDefImpl.java | 26 +++++ .../util/defs/impl/ResponseNegotiatorDefImpl.java | 6 ++ .../net4j/util/defs/impl/ThreadPoolDefImpl.java | 2 +- .../org/eclipse/net4j/util/defs/impl/UserImpl.java | 6 ++ .../net4j/util/defs/impl/UserManagerDefImpl.java | 2 + .../net4j/util/defs/util/Net4jUtilDefsSwitch.java | 50 ++++++++++ .../BusinessItemProviderAdapterFactory.java | 10 +- .../gastro/business/impl/BusinessFactoryImpl.java | 10 +- .../gastro/business/impl/BusinessPackageImpl.java | 34 ++++--- .../org/gastro/business/util/BusinessSwitch.java | 8 ++ .../InventoryItemProviderAdapterFactory.java | 24 ++++- .../inventory/impl/InventoryFactoryImpl.java | 22 ++--- .../inventory/impl/InventoryPackageImpl.java | 106 +++++++++++---------- .../org/gastro/inventory/util/InventorySwitch.java | 34 +++++++ .../src/org/gastro/internal/rcp/Application.java | 4 + .../src-gen/templates/MenuCardTemplate.java | 2 +- 147 files changed, 2224 insertions(+), 450 deletions(-) diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java index 690dab3aa0..b6a76638d4 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java @@ -97,8 +97,10 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef Date oldTimeStamp = timeStamp; timeStamp = newTimeStamp; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp, timeStamp)); + } } /** @@ -176,7 +178,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (timeStamp: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java index fb3849c36f..15ddbb388f 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java @@ -289,8 +289,10 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory { ResourceMode result = ResourceMode.get(initialValue); if (result == null) + { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java index c4dc0567d0..e9b64f5a1e 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java @@ -191,7 +191,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public static CDODefsPackage init() { if (isInited) + { return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI); + } // Obtain or create and register package CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE @@ -543,7 +545,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -610,7 +614,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -630,24 +636,24 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage // Add supertypes to classes cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef()); - cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef()); + cdoTransactionDefEClass.getESuperTypes().add(getCDOViewDef()); + cdoAuditDefEClass.getESuperTypes().add(getCDOViewDef()); cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); failOverStrategyDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - retryFailOverStrategyDefEClass.getESuperTypes().add(this.getFailOverStrategyDef()); + retryFailOverStrategyDefEClass.getESuperTypes().add(getFailOverStrategyDef()); cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef()); - cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef()); + cdoEagerPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef()); + cdoLazyPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef()); ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef()); - eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef()); + eDynamicPackageDefEClass.getESuperTypes().add(getEPackageDef()); + eGlobalPackageDefEClass.getESuperTypes().add(getEPackageDef()); cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef()); cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, + initEReference(getCDOViewDef_CdoSessionDef(), getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -667,14 +673,14 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null, - "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCDOSessionDef_CdoPackageRegistryDef(), getCDOPackageRegistryDef(), null, "cdoPackageRegistryDef", + null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled", "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCDOSessionDef_FailOverStrategyDef(), this.getFailOverStrategyDef(), null, "failOverStrategyDef", - null, 0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getCDOSessionDef_FailOverStrategyDef(), getFailOverStrategyDef(), null, "failOverStrategyDef", null, + 0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(failOverStrategyDefEClass, FailOverStrategyDef.class, "FailOverStrategyDef", IS_ABSTRACT, !IS_INTERFACE, @@ -691,7 +697,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1, + initEReference(getCDOPackageRegistryDef_Packages(), getEPackageDef(), null, "packages", null, 0, -1, CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -720,10 +726,10 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, + initEReference(getCDOResourceDef_CdoTransaction(), getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1, + initEAttribute(getCDOResourceDef_ResourceMode(), getResourceMode(), "resourceMode", "null", 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class, diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java index 002f3bc7f4..e86cecc682 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java @@ -125,8 +125,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef if (cdoTransaction != oldCdoTransaction) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction)); + } } } return cdoTransaction; @@ -152,8 +154,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef CDOTransactionDef oldCdoTransaction = cdoTransaction; cdoTransaction = newCdoTransaction; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction)); + } } /** @@ -176,8 +180,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef ResourceMode oldResourceMode = resourceMode; resourceMode = newResourceMode == null ? RESOURCE_MODE_EDEFAULT : newResourceMode; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE, oldResourceMode, resourceMode)); + } } /** @@ -200,7 +206,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef String oldPath = path; path = newPath; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path)); + } } /** @@ -215,7 +223,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef { case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION: if (resolve) + { return getCdoTransaction(); + } return basicGetCdoTransaction(); case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE: return getResourceMode(); @@ -300,7 +310,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourceMode: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java index 7dc4b6f496..d5ced63bc1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java @@ -172,8 +172,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef if (connectorDef != oldConnectorDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef)); + } } } return connectorDef; @@ -223,8 +225,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef boolean oldConnectorDefESet = connectorDefESet; connectorDefESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef, !oldConnectorDefESet)); + } } /** @@ -239,8 +243,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef connectorDef = null; connectorDefESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF, oldConnectorDef, null, oldConnectorDefESet)); + } } /** @@ -273,8 +279,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef String oldRepositoryName = repositoryName; repositoryName = newRepositoryName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME, oldRepositoryName, repositoryName)); + } } /** @@ -291,8 +299,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef if (cdoPackageRegistryDef != oldCdoPackageRegistryDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef)); + } } } return cdoPackageRegistryDef; @@ -318,8 +328,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef; cdoPackageRegistryDef = newCdoPackageRegistryDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef)); + } } /** @@ -342,8 +354,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef boolean oldLegacySupportEnabled = legacySupportEnabled; legacySupportEnabled = newLegacySupportEnabled; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED, oldLegacySupportEnabled, legacySupportEnabled)); + } } /** @@ -360,8 +374,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef if (failOverStrategyDef != oldFailOverStrategyDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef)); + } } } return failOverStrategyDef; @@ -410,8 +426,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef boolean oldFailOverStrategyDefESet = failOverStrategyDefESet; failOverStrategyDefESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef, !oldFailOverStrategyDefESet)); + } } /** @@ -426,8 +444,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef failOverStrategyDef = null; failOverStrategyDefESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, null, oldFailOverStrategyDefESet)); + } } /** @@ -452,19 +472,25 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef { case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF: if (resolve) + { return getConnectorDef(); + } return basicGetConnectorDef(); case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME: return getRepositoryName(); case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF: if (resolve) + { return getCdoPackageRegistryDef(); + } return basicGetCdoPackageRegistryDef(); case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: return isLegacySupportEnabled(); case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF: if (resolve) + { return getFailOverStrategyDef(); + } return basicGetFailOverStrategyDef(); } return super.eGet(featureID, resolve, coreType); @@ -562,7 +588,9 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (repositoryName: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java index 46310818b0..78a91fd428 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java @@ -84,8 +84,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef if (cdoSessionDef != oldCdoSessionDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef)); + } } } return cdoSessionDef; @@ -111,8 +113,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef CDOSessionDef oldCdoSessionDef = cdoSessionDef; cdoSessionDef = newCdoSessionDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef)); + } } /** @@ -127,7 +131,9 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef { case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF: if (resolve) + { return getCdoSessionDef(); + } return basicGetCdoSessionDef(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java index 5ce1c759af..05d6fc4aa7 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java @@ -95,8 +95,10 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP String oldResourceURI = resourceURI; resourceURI = newResourceURI; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI, oldResourceURI, resourceURI)); + } } /** @@ -174,7 +176,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourceURI: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java index a809042675..792547d31d 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java @@ -98,7 +98,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef String oldNsURI = nsURI; nsURI = newNsURI; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI)); + } } /** @@ -176,7 +178,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (nsURI: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java index 13aa7094ef..99ecc7e5df 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java @@ -81,8 +81,10 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve if (connectorDef != oldConnectorDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef)); + } } } return connectorDef; @@ -108,8 +110,10 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve ConnectorDef oldConnectorDef = connectorDef; connectorDef = newConnectorDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef)); + } } /** @@ -124,7 +128,9 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve { case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF: if (resolve) + { return getConnectorDef(); + } return basicGetConnectorDef(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java index 54da80838e..1b1ff8f5a4 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java @@ -107,8 +107,10 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem boolean oldRetriesESet = retriesESet; retriesESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, retries, !oldRetriesESet)); + } } /** @@ -123,8 +125,10 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem retries = RETRIES_EDEFAULT; retriesESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, oldRetries, RETRIES_EDEFAULT, oldRetriesESet)); + } } /** @@ -212,14 +216,20 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (retries: "); if (retriesESet) + { result.append(retries); + } else + { result.append(""); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java index d47f8ac188..b4927872f7 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java @@ -115,9 +115,13 @@ public class CDODefsSwitch CDOViewDef cdoViewDef = (CDOViewDef)theEObject; T result = caseCDOViewDef(cdoViewDef); if (result == null) + { result = caseDef(cdoViewDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_TRANSACTION_DEF: @@ -125,11 +129,17 @@ public class CDODefsSwitch CDOTransactionDef cdoTransactionDef = (CDOTransactionDef)theEObject; T result = caseCDOTransactionDef(cdoTransactionDef); if (result == null) + { result = caseCDOViewDef(cdoTransactionDef); + } if (result == null) + { result = caseDef(cdoTransactionDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_AUDIT_DEF: @@ -137,11 +147,17 @@ public class CDODefsSwitch CDOAuditDef cdoAuditDef = (CDOAuditDef)theEObject; T result = caseCDOAuditDef(cdoAuditDef); if (result == null) + { result = caseCDOViewDef(cdoAuditDef); + } if (result == null) + { result = caseDef(cdoAuditDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_SESSION_DEF: @@ -149,9 +165,13 @@ public class CDODefsSwitch CDOSessionDef cdoSessionDef = (CDOSessionDef)theEObject; T result = caseCDOSessionDef(cdoSessionDef); if (result == null) + { result = caseDef(cdoSessionDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.FAIL_OVER_STRATEGY_DEF: @@ -159,9 +179,13 @@ public class CDODefsSwitch FailOverStrategyDef failOverStrategyDef = (FailOverStrategyDef)theEObject; T result = caseFailOverStrategyDef(failOverStrategyDef); if (result == null) + { result = caseDef(failOverStrategyDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF: @@ -169,11 +193,17 @@ public class CDODefsSwitch RetryFailOverStrategyDef retryFailOverStrategyDef = (RetryFailOverStrategyDef)theEObject; T result = caseRetryFailOverStrategyDef(retryFailOverStrategyDef); if (result == null) + { result = caseFailOverStrategyDef(retryFailOverStrategyDef); + } if (result == null) + { result = caseDef(retryFailOverStrategyDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF: @@ -181,9 +211,13 @@ public class CDODefsSwitch CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject; T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef); if (result == null) + { result = caseDef(cdoPackageRegistryDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF: @@ -191,11 +225,17 @@ public class CDODefsSwitch CDOEagerPackageRegistryDef cdoEagerPackageRegistryDef = (CDOEagerPackageRegistryDef)theEObject; T result = caseCDOEagerPackageRegistryDef(cdoEagerPackageRegistryDef); if (result == null) + { result = caseCDOPackageRegistryDef(cdoEagerPackageRegistryDef); + } if (result == null) + { result = caseDef(cdoEagerPackageRegistryDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF: @@ -203,11 +243,17 @@ public class CDODefsSwitch CDOLazyPackageRegistryDef cdoLazyPackageRegistryDef = (CDOLazyPackageRegistryDef)theEObject; T result = caseCDOLazyPackageRegistryDef(cdoLazyPackageRegistryDef); if (result == null) + { result = caseCDOPackageRegistryDef(cdoLazyPackageRegistryDef); + } if (result == null) + { result = caseDef(cdoLazyPackageRegistryDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.EPACKAGE_DEF: @@ -215,9 +261,13 @@ public class CDODefsSwitch EPackageDef ePackageDef = (EPackageDef)theEObject; T result = caseEPackageDef(ePackageDef); if (result == null) + { result = caseDef(ePackageDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.EDYNAMIC_PACKAGE_DEF: @@ -225,11 +275,17 @@ public class CDODefsSwitch EDynamicPackageDef eDynamicPackageDef = (EDynamicPackageDef)theEObject; T result = caseEDynamicPackageDef(eDynamicPackageDef); if (result == null) + { result = caseEPackageDef(eDynamicPackageDef); + } if (result == null) + { result = caseDef(eDynamicPackageDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.EGLOBAL_PACKAGE_DEF: @@ -237,11 +293,17 @@ public class CDODefsSwitch EGlobalPackageDef eGlobalPackageDef = (EGlobalPackageDef)theEObject; T result = caseEGlobalPackageDef(eGlobalPackageDef); if (result == null) + { result = caseEPackageDef(eGlobalPackageDef); + } if (result == null) + { result = caseDef(eGlobalPackageDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF: @@ -249,13 +311,21 @@ public class CDODefsSwitch CDOClientProtocolFactoryDef cdoClientProtocolFactoryDef = (CDOClientProtocolFactoryDef)theEObject; T result = caseCDOClientProtocolFactoryDef(cdoClientProtocolFactoryDef); if (result == null) + { result = caseClientProtocolFactoryDef(cdoClientProtocolFactoryDef); + } if (result == null) + { result = caseProtocolProviderDef(cdoClientProtocolFactoryDef); + } if (result == null) + { result = caseDef(cdoClientProtocolFactoryDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDODefsPackage.CDO_RESOURCE_DEF: @@ -263,9 +333,13 @@ public class CDODefsSwitch CDOResourceDef cdoResourceDef = (CDOResourceDef)theEObject; T result = caseCDOResourceDef(cdoResourceDef); if (result == null) + { result = caseDef(cdoResourceDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java index 1206d07748..3fc2c89f36 100644 --- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java @@ -197,7 +197,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) + if (!(type instanceof Class) || ((Class)type).isInstance(adapter)) { return adapter; } @@ -280,9 +280,13 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory public void dispose() { if (cdoResourceFolderItemProvider != null) + { cdoResourceFolderItemProvider.dispose(); + } if (cdoResourceItemProvider != null) + { cdoResourceItemProvider.dispose(); + } } } diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java index e67a46c9fd..ab0d7792be 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java @@ -439,7 +439,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) + if (!(type instanceof Class) || ((Class)type).isInstance(adapter)) { return adapter; } @@ -522,27 +522,49 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp public void dispose() { if (addressItemProvider != null) + { addressItemProvider.dispose(); + } if (companyItemProvider != null) + { companyItemProvider.dispose(); + } if (supplierItemProvider != null) + { supplierItemProvider.dispose(); + } if (customerItemProvider != null) + { customerItemProvider.dispose(); + } if (orderItemProvider != null) + { orderItemProvider.dispose(); + } if (orderDetailItemProvider != null) + { orderDetailItemProvider.dispose(); + } if (orderAddressItemProvider != null) + { orderAddressItemProvider.dispose(); + } if (purchaseOrderItemProvider != null) + { purchaseOrderItemProvider.dispose(); + } if (salesOrderItemProvider != null) + { salesOrderItemProvider.dispose(); + } if (categoryItemProvider != null) + { categoryItemProvider.dispose(); + } if (productItemProvider != null) + { productItemProvider.dispose(); + } } } diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java index 3ad496fa00..577950421c 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyFactoryImpl.java @@ -214,8 +214,10 @@ public class CompanyFactoryImpl extends EFactoryImpl implements CompanyFactory { VAT result = VAT.get(initialValue); if (result == null) + { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java index 23e338f54d..3a2a3f86d0 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/impl/CompanyPackageImpl.java @@ -169,7 +169,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage public static CompanyPackage init() { if (isInited) + { return (CompanyPackage)EPackage.Registry.INSTANCE.getEPackage(CompanyPackage.eNS_URI); + } // Obtain or create and register package CompanyPackageImpl theCompanyPackage = (CompanyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CompanyPackageImpl ? EPackage.Registry.INSTANCE @@ -608,7 +610,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -681,7 +685,9 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -694,14 +700,14 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage // Set bounds for type parameters // Add supertypes to classes - companyEClass.getESuperTypes().add(this.getAddress()); - supplierEClass.getESuperTypes().add(this.getAddress()); - customerEClass.getESuperTypes().add(this.getAddress()); - orderAddressEClass.getESuperTypes().add(this.getAddress()); - orderAddressEClass.getESuperTypes().add(this.getOrder()); - orderAddressEClass.getESuperTypes().add(this.getOrderDetail()); - purchaseOrderEClass.getESuperTypes().add(this.getOrder()); - salesOrderEClass.getESuperTypes().add(this.getOrder()); + companyEClass.getESuperTypes().add(getAddress()); + supplierEClass.getESuperTypes().add(getAddress()); + customerEClass.getESuperTypes().add(getAddress()); + orderAddressEClass.getESuperTypes().add(getAddress()); + orderAddressEClass.getESuperTypes().add(getOrder()); + orderAddressEClass.getESuperTypes().add(getOrderDetail()); + purchaseOrderEClass.getESuperTypes().add(getOrder()); + salesOrderEClass.getESuperTypes().add(getOrder()); // Initialize classes and features; add operations and parameters initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -713,45 +719,45 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class, + initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class, + initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, - Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, + initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(), - "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", + null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null, - 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, + Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, - 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, + Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1, - OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOrderDetail_Product(), this.getProduct(), this.getProduct_OrderDetails(), "product", null, 0, 1, + initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getOrderDetail_Product(), getProduct(), getProduct_OrderDetails(), "product", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, @@ -767,35 +773,35 @@ public class CompanyPackageImpl extends EPackageImpl implements CompanyPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", - null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, + PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, - 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, + SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getCategory_Products(), this.getProduct(), null, "products", null, 0, -1, Category.class, + initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCategory_Products(), getProduct(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getProduct_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getProduct_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails", - null, 0, -1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getProduct_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, + initEReference(getProduct_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, + Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getProduct_Vat(), getVAT(), "vat", "vat15", 0, 1, Product.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getProduct_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java index ae9d825db9..9e4d699bea 100644 --- a/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java +++ b/plugins/org.eclipse.emf.cdo.examples.company/src/org/eclipse/emf/cdo/examples/company/util/CompanySwitch.java @@ -114,7 +114,9 @@ public class CompanySwitch Address address = (Address)theEObject; T result = caseAddress(address); if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.COMPANY: @@ -122,9 +124,13 @@ public class CompanySwitch Company company = (Company)theEObject; T result = caseCompany(company); if (result == null) + { result = caseAddress(company); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.SUPPLIER: @@ -132,9 +138,13 @@ public class CompanySwitch Supplier supplier = (Supplier)theEObject; T result = caseSupplier(supplier); if (result == null) + { result = caseAddress(supplier); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.CUSTOMER: @@ -142,9 +152,13 @@ public class CompanySwitch Customer customer = (Customer)theEObject; T result = caseCustomer(customer); if (result == null) + { result = caseAddress(customer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.ORDER: @@ -152,7 +166,9 @@ public class CompanySwitch Order order = (Order)theEObject; T result = caseOrder(order); if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.ORDER_DETAIL: @@ -160,7 +176,9 @@ public class CompanySwitch OrderDetail orderDetail = (OrderDetail)theEObject; T result = caseOrderDetail(orderDetail); if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.ORDER_ADDRESS: @@ -168,13 +186,21 @@ public class CompanySwitch OrderAddress orderAddress = (OrderAddress)theEObject; T result = caseOrderAddress(orderAddress); if (result == null) + { result = caseAddress(orderAddress); + } if (result == null) + { result = caseOrder(orderAddress); + } if (result == null) + { result = caseOrderDetail(orderAddress); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.PURCHASE_ORDER: @@ -182,9 +208,13 @@ public class CompanySwitch PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject; T result = casePurchaseOrder(purchaseOrder); if (result == null) + { result = caseOrder(purchaseOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.SALES_ORDER: @@ -192,9 +222,13 @@ public class CompanySwitch SalesOrder salesOrder = (SalesOrder)theEObject; T result = caseSalesOrder(salesOrder); if (result == null) + { result = caseOrder(salesOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.CATEGORY: @@ -202,7 +236,9 @@ public class CompanySwitch Category category = (Category)theEObject; T result = caseCategory(category); if (result == null) + { result = defaultCase(theEObject); + } return result; } case CompanyPackage.PRODUCT: @@ -210,7 +246,9 @@ public class CompanySwitch Product product = (Product)theEObject; T result = caseProduct(product); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java index d817179119..f7800aff46 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java @@ -170,8 +170,10 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory { ParameterPassing result = ParameterPassing.get(initialValue); if (result == null) + { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java index 4433a187af..09180f11e5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java @@ -104,7 +104,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public static MangoPackage init() { if (isInited) + { return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI); + } // Obtain or create and register package MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE @@ -243,7 +245,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -278,7 +282,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -297,7 +303,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, + initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -310,9 +316,8 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, - MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing"); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java index ddc8332083..40da0771c8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java @@ -113,7 +113,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__NAME, oldName, name)); + } } /** @@ -136,7 +138,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter ParameterPassing oldPassing = passing; passing = newPassing == null ? PASSING_EDEFAULT : newPassing; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing)); + } } /** @@ -224,7 +228,9 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java index 0f9a21662a..9acd490afe 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java @@ -91,7 +91,9 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE__NAME, oldName, name)); + } } /** @@ -169,7 +171,9 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java index 7c01df0c02..40c3cc5615 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java @@ -107,7 +107,9 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE_LIST__NAME, oldName, name)); + } } /** @@ -211,7 +213,9 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java index cf6bcdfea5..9497795859 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java @@ -161,8 +161,10 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory { ParameterPassing result = ParameterPassing.get(initialValue); if (result == null) + { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java index 63f0a99704..988b5af820 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java @@ -99,7 +99,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public static MangoPackage init() { if (isInited) + { return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI); + } // Obtain or create and register package MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE @@ -238,7 +240,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -273,7 +277,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -292,7 +298,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, + initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -305,9 +311,8 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, - MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing"); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java index 7cf0c5438c..54b9a59ab1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java @@ -99,7 +99,9 @@ public class MangoSwitch MangoValueList mangoValueList = (MangoValueList)theEObject; T result = caseMangoValueList(mangoValueList); if (result == null) + { result = defaultCase(theEObject); + } return result; } case MangoPackage.MANGO_VALUE: @@ -107,7 +109,9 @@ public class MangoSwitch MangoValue mangoValue = (MangoValue)theEObject; T result = caseMangoValue(mangoValue); if (result == null) + { result = defaultCase(theEObject); + } return result; } case MangoPackage.MANGO_PARAMETER: @@ -115,7 +119,9 @@ public class MangoSwitch MangoParameter mangoParameter = (MangoParameter)theEObject; T result = caseMangoParameter(mangoParameter); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java index 9580fb159f..bc835b60c5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java @@ -229,8 +229,10 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { VAT result = VAT.get(initialValue); if (result == null) + { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java index f6aa90043f..4dc9dfea73 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java @@ -178,7 +178,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package public static Model1Package init() { if (isInited) + { return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI); + } // Obtain or create and register package Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE @@ -657,7 +659,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -735,7 +739,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -748,14 +754,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package // Set bounds for type parameters // Add supertypes to classes - companyEClass.getESuperTypes().add(this.getAddress()); - supplierEClass.getESuperTypes().add(this.getAddress()); - customerEClass.getESuperTypes().add(this.getAddress()); - purchaseOrderEClass.getESuperTypes().add(this.getOrder()); - salesOrderEClass.getESuperTypes().add(this.getOrder()); - orderAddressEClass.getESuperTypes().add(this.getAddress()); - orderAddressEClass.getESuperTypes().add(this.getOrder()); - orderAddressEClass.getESuperTypes().add(this.getOrderDetail()); + companyEClass.getESuperTypes().add(getAddress()); + supplierEClass.getESuperTypes().add(getAddress()); + customerEClass.getESuperTypes().add(getAddress()); + purchaseOrderEClass.getESuperTypes().add(getOrder()); + salesOrderEClass.getESuperTypes().add(getOrder()); + orderAddressEClass.getESuperTypes().add(getAddress()); + orderAddressEClass.getESuperTypes().add(getOrder()); + orderAddressEClass.getESuperTypes().add(getOrderDetail()); // Initialize classes and features; add operations and parameters initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -767,49 +773,49 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class, + initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class, + initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, - Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, + initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(), - "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", + null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null, - 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1, + initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, + Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, - 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, + Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1, - OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0, - 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1, + OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -818,35 +824,35 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", - null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, + PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, - 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, + SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class, + initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails", - null, 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, + initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, + Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -859,10 +865,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); - initEReference(getProductToOrder_Key(), this.getProduct1(), null, "key", null, 0, 1, Map.Entry.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getProductToOrder_Value(), this.getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class, + initEReference(getProductToOrder_Key(), getProduct1(), null, "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getProductToOrder_Value(), getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java index 54dc2469cf..5095cca476 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java @@ -132,7 +132,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry if (hash == -1) { Object theKey = getKey(); - hash = (theKey == null ? 0 : theKey.hashCode()); + hash = theKey == null ? 0 : theKey.hashCode(); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java index 670762f922..11419dfbf9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java @@ -115,7 +115,9 @@ public class Model1Switch Address address = (Address)theEObject; T result = caseAddress(address); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.COMPANY: @@ -123,9 +125,13 @@ public class Model1Switch Company company = (Company)theEObject; T result = caseCompany(company); if (result == null) + { result = caseAddress(company); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.SUPPLIER: @@ -133,9 +139,13 @@ public class Model1Switch Supplier supplier = (Supplier)theEObject; T result = caseSupplier(supplier); if (result == null) + { result = caseAddress(supplier); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.CUSTOMER: @@ -143,9 +153,13 @@ public class Model1Switch Customer customer = (Customer)theEObject; T result = caseCustomer(customer); if (result == null) + { result = caseAddress(customer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.ORDER: @@ -153,7 +167,9 @@ public class Model1Switch Order order = (Order)theEObject; T result = caseOrder(order); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.ORDER_DETAIL: @@ -161,7 +177,9 @@ public class Model1Switch OrderDetail orderDetail = (OrderDetail)theEObject; T result = caseOrderDetail(orderDetail); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.PURCHASE_ORDER: @@ -169,9 +187,13 @@ public class Model1Switch PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject; T result = casePurchaseOrder(purchaseOrder); if (result == null) + { result = caseOrder(purchaseOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.SALES_ORDER: @@ -179,9 +201,13 @@ public class Model1Switch SalesOrder salesOrder = (SalesOrder)theEObject; T result = caseSalesOrder(salesOrder); if (result == null) + { result = caseOrder(salesOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.CATEGORY: @@ -189,7 +215,9 @@ public class Model1Switch Category category = (Category)theEObject; T result = caseCategory(category); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.PRODUCT1: @@ -197,7 +225,9 @@ public class Model1Switch Product1 product1 = (Product1)theEObject; T result = caseProduct1(product1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.ORDER_ADDRESS: @@ -205,13 +235,21 @@ public class Model1Switch OrderAddress orderAddress = (OrderAddress)theEObject; T result = caseOrderAddress(orderAddress); if (result == null) + { result = caseAddress(orderAddress); + } if (result == null) + { result = caseOrder(orderAddress); + } if (result == null) + { result = caseOrderDetail(orderAddress); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model1Package.PRODUCT_TO_ORDER: @@ -220,7 +258,9 @@ public class Model1Switch Map.Entry productToOrder = (Map.Entry)theEObject; T result = caseProductToOrder(productToOrder); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java index d9504db2ae..1331a2f517 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Model2PackageImpl.java @@ -123,7 +123,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public static Model2Package init() { if (isInited) + { return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI); + } // Obtain or create and register package Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE @@ -585,7 +587,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -654,7 +658,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -684,14 +690,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1, + initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1, TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer", - null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1, + Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT, @@ -774,10 +780,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPersistentContainment_Children(), this.getTransientContainer(), this - .getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - !IS_ORDERED); + initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(), + "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -787,10 +792,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), this - .getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(), + "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java index 9af57bfba1..6505b90b65 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java @@ -134,8 +134,10 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent String oldAttrBefore = attrBefore; attrBefore = newAttrBefore; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE, oldAttrBefore, attrBefore)); + } } /** @@ -173,8 +175,10 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent String oldAttrAfter = attrAfter; attrAfter = newAttrAfter; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER, oldAttrAfter, attrAfter)); + } } /** @@ -307,7 +311,9 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (attrBefore: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java index 9d1b910200..dc465615f5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java @@ -109,8 +109,10 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci String oldDiscountCode = discountCode; discountCode = newDiscountCode; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, oldDiscountCode, discountCode)); + } } /** @@ -137,9 +139,13 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress, newShippingAddress); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -155,18 +161,26 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci { NotificationChain msgs = null; if (shippingAddress != null) + { msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs); + } if (newShippingAddress != null) + { msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs); + } msgs = basicSetShippingAddress(newShippingAddress, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, newShippingAddress, newShippingAddress)); + } } /** @@ -270,7 +284,9 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (discountCode: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java index a1ce01f1c1..a2d7942935 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TaskImpl.java @@ -104,7 +104,9 @@ public class TaskImpl extends EObjectImpl implements Task public TaskContainer getTaskContainer() { if (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER) + { return null; + } return (TaskContainer)eContainer(); } @@ -126,24 +128,34 @@ public class TaskImpl extends EObjectImpl implements Task */ public void setTaskContainer(TaskContainer newTaskContainer) { - if (newTaskContainer != eInternalContainer() - || (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null)) + if (newTaskContainer != eInternalContainer() || eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER + && newTaskContainer != null) { if (EcoreUtil.isAncestor(this, newTaskContainer)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newTaskContainer != null) + { msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS, TaskContainer.class, msgs); + } msgs = basicSetTaskContainer(newTaskContainer, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer, newTaskContainer)); + } } /** @@ -166,8 +178,10 @@ public class TaskImpl extends EObjectImpl implements Task String oldDescription = description; description = newDescription; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription, description)); + } } /** @@ -190,7 +204,9 @@ public class TaskImpl extends EObjectImpl implements Task boolean oldDone = done; done = newDone; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DONE, oldDone, done)); + } } /** @@ -205,7 +221,9 @@ public class TaskImpl extends EObjectImpl implements Task { case Model2Package.TASK__TASK_CONTAINER: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetTaskContainer((TaskContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -338,7 +356,9 @@ public class TaskImpl extends EObjectImpl implements Task public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (description: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java index 2ad3c528fc..6c74a01b5a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/TransientContainerImpl.java @@ -119,8 +119,10 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont String oldAttrBefore = attrBefore; attrBefore = newAttrBefore; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE, oldAttrBefore, attrBefore)); + } } /** @@ -131,7 +133,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont public PersistentContainment getParent() { if (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT) + { return null; + } return (PersistentContainment)eContainer(); } @@ -153,24 +157,34 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont */ public void setParent(PersistentContainment newParent) { - if (newParent != eInternalContainer() - || (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null)) + if (newParent != eInternalContainer() || eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT + && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN, PersistentContainment.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent, newParent)); + } } /** @@ -193,8 +207,10 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont String oldAttrAfter = attrAfter; attrAfter = newAttrAfter; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER, oldAttrAfter, attrAfter)); + } } /** @@ -209,7 +225,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont { case Model2Package.TRANSIENT_CONTAINER__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((PersistentContainment)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -343,7 +361,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (attrBefore: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java index 373595c203..66f01bef36 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable1Impl.java @@ -400,8 +400,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableBooleanESet = unsettableBooleanESet; unsettableBooleanESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet)); + } } /** @@ -416,8 +418,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT; unsettableBooleanESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet)); + } } /** @@ -452,8 +456,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableByteESet = unsettableByteESet; unsettableByteESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE, oldUnsettableByte, unsettableByte, !oldUnsettableByteESet)); + } } /** @@ -468,8 +474,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableByte = UNSETTABLE_BYTE_EDEFAULT; unsettableByteESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE, oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet)); + } } /** @@ -504,8 +512,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableCharESet = unsettableCharESet; unsettableCharESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR, oldUnsettableChar, unsettableChar, !oldUnsettableCharESet)); + } } /** @@ -520,8 +530,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableChar = UNSETTABLE_CHAR_EDEFAULT; unsettableCharESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR, oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet)); + } } /** @@ -556,8 +568,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableDateESet = unsettableDateESet; unsettableDateESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE, oldUnsettableDate, unsettableDate, !oldUnsettableDateESet)); + } } /** @@ -572,8 +586,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableDate = UNSETTABLE_DATE_EDEFAULT; unsettableDateESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE, oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet)); + } } /** @@ -608,8 +624,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableDoubleESet = unsettableDoubleESet; unsettableDoubleESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE, oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet)); + } } /** @@ -624,8 +642,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT; unsettableDoubleESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet)); + } } /** @@ -660,8 +680,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableFloatESet = unsettableFloatESet; unsettableFloatESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT, oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet)); + } } /** @@ -676,8 +698,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT; unsettableFloatESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT, oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet)); + } } /** @@ -712,8 +736,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableIntESet = unsettableIntESet; unsettableIntESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt, unsettableInt, !oldUnsettableIntESet)); + } } /** @@ -728,8 +754,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableInt = UNSETTABLE_INT_EDEFAULT; unsettableIntESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet)); + } } /** @@ -764,8 +792,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableLongESet = unsettableLongESet; unsettableLongESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG, oldUnsettableLong, unsettableLong, !oldUnsettableLongESet)); + } } /** @@ -780,8 +810,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableLong = UNSETTABLE_LONG_EDEFAULT; unsettableLongESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG, oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet)); + } } /** @@ -816,8 +848,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableShortESet = unsettableShortESet; unsettableShortESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT, oldUnsettableShort, unsettableShort, !oldUnsettableShortESet)); + } } /** @@ -832,8 +866,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableShort = UNSETTABLE_SHORT_EDEFAULT; unsettableShortESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT, oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet)); + } } /** @@ -868,8 +904,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableStringESet = unsettableStringESet; unsettableStringESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING, oldUnsettableString, unsettableString, !oldUnsettableStringESet)); + } } /** @@ -884,8 +922,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableString = UNSETTABLE_STRING_EDEFAULT; unsettableStringESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet)); + } } /** @@ -920,8 +960,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableVATESet = unsettableVATESet; unsettableVATESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet)); + } } /** @@ -936,8 +978,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableVAT = UNSETTABLE_VAT_EDEFAULT; unsettableVATESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet)); + } } /** @@ -1125,64 +1169,110 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (unsettableBoolean: "); if (unsettableBooleanESet) + { result.append(unsettableBoolean); + } else + { result.append(""); + } result.append(", unsettableByte: "); if (unsettableByteESet) + { result.append(unsettableByte); + } else + { result.append(""); + } result.append(", unsettableChar: "); if (unsettableCharESet) + { result.append(unsettableChar); + } else + { result.append(""); + } result.append(", unsettableDate: "); if (unsettableDateESet) + { result.append(unsettableDate); + } else + { result.append(""); + } result.append(", unsettableDouble: "); if (unsettableDoubleESet) + { result.append(unsettableDouble); + } else + { result.append(""); + } result.append(", unsettableFloat: "); if (unsettableFloatESet) + { result.append(unsettableFloat); + } else + { result.append(""); + } result.append(", unsettableInt: "); if (unsettableIntESet) + { result.append(unsettableInt); + } else + { result.append(""); + } result.append(", unsettableLong: "); if (unsettableLongESet) + { result.append(unsettableLong); + } else + { result.append(""); + } result.append(", unsettableShort: "); if (unsettableShortESet) + { result.append(unsettableShort); + } else + { result.append(""); + } result.append(", unsettableString: "); if (unsettableStringESet) + { result.append(unsettableString); + } else + { result.append(""); + } result.append(", unsettableVAT: "); if (unsettableVATESet) + { result.append(unsettableVAT); + } else + { result.append(""); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java index 4cd54c9bad..b82f85a71a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/Unsettable2WithDefaultImpl.java @@ -410,8 +410,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableBooleanESet = unsettableBooleanESet; unsettableBooleanESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet)); + } } /** @@ -426,9 +428,11 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT; unsettableBooleanESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet)); + } } /** @@ -463,8 +467,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableByteESet = unsettableByteESet; unsettableByteESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, oldUnsettableByte, unsettableByte, !oldUnsettableByteESet)); + } } /** @@ -479,8 +485,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableByte = UNSETTABLE_BYTE_EDEFAULT; unsettableByteESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet)); + } } /** @@ -515,8 +523,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableCharESet = unsettableCharESet; unsettableCharESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, oldUnsettableChar, unsettableChar, !oldUnsettableCharESet)); + } } /** @@ -531,8 +541,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableChar = UNSETTABLE_CHAR_EDEFAULT; unsettableCharESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet)); + } } /** @@ -567,8 +579,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableDateESet = unsettableDateESet; unsettableDateESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, oldUnsettableDate, unsettableDate, !oldUnsettableDateESet)); + } } /** @@ -583,8 +597,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableDate = UNSETTABLE_DATE_EDEFAULT; unsettableDateESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet)); + } } /** @@ -619,8 +635,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableDoubleESet = unsettableDoubleESet; unsettableDoubleESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet)); + } } /** @@ -635,9 +653,11 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT; unsettableDoubleESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet)); + } } /** @@ -672,8 +692,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableFloatESet = unsettableFloatESet; unsettableFloatESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet)); + } } /** @@ -688,8 +710,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT; unsettableFloatESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet)); + } } /** @@ -724,8 +748,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableIntESet = unsettableIntESet; unsettableIntESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, oldUnsettableInt, unsettableInt, !oldUnsettableIntESet)); + } } /** @@ -740,8 +766,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableInt = UNSETTABLE_INT_EDEFAULT; unsettableIntESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet)); + } } /** @@ -776,8 +804,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableLongESet = unsettableLongESet; unsettableLongESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, oldUnsettableLong, unsettableLong, !oldUnsettableLongESet)); + } } /** @@ -792,8 +822,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableLong = UNSETTABLE_LONG_EDEFAULT; unsettableLongESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet)); + } } /** @@ -828,8 +860,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableShortESet = unsettableShortESet; unsettableShortESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, oldUnsettableShort, unsettableShort, !oldUnsettableShortESet)); + } } /** @@ -844,8 +878,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableShort = UNSETTABLE_SHORT_EDEFAULT; unsettableShortESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet)); + } } /** @@ -880,8 +916,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableStringESet = unsettableStringESet; unsettableStringESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, unsettableString, !oldUnsettableStringESet)); + } } /** @@ -896,9 +934,11 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableString = UNSETTABLE_STRING_EDEFAULT; unsettableStringESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet)); + } } /** @@ -933,8 +973,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableVATESet = unsettableVATESet; unsettableVATESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet)); + } } /** @@ -949,8 +991,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableVAT = UNSETTABLE_VAT_EDEFAULT; unsettableVATESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet)); + } } /** @@ -1138,64 +1182,110 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (unsettableBoolean: "); if (unsettableBooleanESet) + { result.append(unsettableBoolean); + } else + { result.append(""); + } result.append(", unsettableByte: "); if (unsettableByteESet) + { result.append(unsettableByte); + } else + { result.append(""); + } result.append(", unsettableChar: "); if (unsettableCharESet) + { result.append(unsettableChar); + } else + { result.append(""); + } result.append(", unsettableDate: "); if (unsettableDateESet) + { result.append(unsettableDate); + } else + { result.append(""); + } result.append(", unsettableDouble: "); if (unsettableDoubleESet) + { result.append(unsettableDouble); + } else + { result.append(""); + } result.append(", unsettableFloat: "); if (unsettableFloatESet) + { result.append(unsettableFloat); + } else + { result.append(""); + } result.append(", unsettableInt: "); if (unsettableIntESet) + { result.append(unsettableInt); + } else + { result.append(""); + } result.append(", unsettableLong: "); if (unsettableLongESet) + { result.append(unsettableLong); + } else + { result.append(""); + } result.append(", unsettableShort: "); if (unsettableShortESet) + { result.append(unsettableShort); + } else + { result.append(""); + } result.append(", unsettableString: "); if (unsettableStringESet) + { result.append(unsettableString); + } else + { result.append(""); + } result.append(", unsettableVAT: "); if (unsettableVATESet) + { result.append(unsettableVAT); + } else + { result.append(""); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java index 1e7f9ef13b..7a6f6002a3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java @@ -105,11 +105,17 @@ public class Model2Switch SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject; T result = caseSpecialPurchaseOrder(specialPurchaseOrder); if (result == null) + { result = casePurchaseOrder(specialPurchaseOrder); + } if (result == null) + { result = caseOrder(specialPurchaseOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK_CONTAINER: @@ -117,7 +123,9 @@ public class Model2Switch TaskContainer taskContainer = (TaskContainer)theEObject; T result = caseTaskContainer(taskContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK: @@ -125,7 +133,9 @@ public class Model2Switch Task task = (Task)theEObject; T result = caseTask(task); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE1: @@ -133,7 +143,9 @@ public class Model2Switch Unsettable1 unsettable1 = (Unsettable1)theEObject; T result = caseUnsettable1(unsettable1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE2_WITH_DEFAULT: @@ -141,7 +153,9 @@ public class Model2Switch Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject; T result = caseUnsettable2WithDefault(unsettable2WithDefault); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.PERSISTENT_CONTAINMENT: @@ -149,7 +163,9 @@ public class Model2Switch PersistentContainment persistentContainment = (PersistentContainment)theEObject; T result = casePersistentContainment(persistentContainment); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TRANSIENT_CONTAINER: @@ -157,7 +173,9 @@ public class Model2Switch TransientContainer transientContainer = (TransientContainer)theEObject; T result = caseTransientContainer(transientContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java index 720462f2ef..2df7a87c14 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java @@ -123,7 +123,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public static Model2Package init() { if (isInited) + { return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI); + } // Obtain or create and register package Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE @@ -585,7 +587,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -654,7 +658,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -684,14 +690,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1, + initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1, TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer", - null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1, + Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT, @@ -774,10 +780,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPersistentContainment_Children(), this.getTransientContainer(), this - .getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - !IS_ORDERED); + initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(), + "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -787,10 +792,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), this - .getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(), + "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java index 82a577d16f..9c92695916 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java @@ -105,11 +105,17 @@ public class Model2Switch SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject; T result = caseSpecialPurchaseOrder(specialPurchaseOrder); if (result == null) + { result = casePurchaseOrder(specialPurchaseOrder); + } if (result == null) + { result = caseOrder(specialPurchaseOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK_CONTAINER: @@ -117,7 +123,9 @@ public class Model2Switch TaskContainer taskContainer = (TaskContainer)theEObject; T result = caseTaskContainer(taskContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK: @@ -125,7 +133,9 @@ public class Model2Switch Task task = (Task)theEObject; T result = caseTask(task); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE1: @@ -133,7 +143,9 @@ public class Model2Switch Unsettable1 unsettable1 = (Unsettable1)theEObject; T result = caseUnsettable1(unsettable1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE2_WITH_DEFAULT: @@ -141,7 +153,9 @@ public class Model2Switch Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject; T result = caseUnsettable2WithDefault(unsettable2WithDefault); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.PERSISTENT_CONTAINMENT: @@ -149,7 +163,9 @@ public class Model2Switch PersistentContainment persistentContainment = (PersistentContainment)theEObject; T result = casePersistentContainment(persistentContainment); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TRANSIENT_CONTAINER: @@ -157,7 +173,9 @@ public class Model2Switch TransientContainer transientContainer = (TransientContainer)theEObject; T result = caseTransientContainer(transientContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java index 6837d39b32..60637a1e00 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java @@ -92,7 +92,9 @@ public class Class1Impl extends EObjectImpl implements Class1 public void unsetClass2() { if (class2 != null) + { ((InternalEList.Unsettable)class2).unset(); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java index 34596e57e4..f5ead76799 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java @@ -78,8 +78,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef if (ePackageRef != oldEPackageRef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.META_REF__EPACKAGE_REF, oldEPackageRef, ePackageRef)); + } } } return ePackageRef; @@ -105,8 +107,10 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef EPackage oldEPackageRef = ePackageRef; ePackageRef = newEPackageRef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.META_REF__EPACKAGE_REF, oldEPackageRef, ePackageRef)); + } } /** @@ -121,7 +125,9 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef { case Model3Package.META_REF__EPACKAGE_REF: if (resolve) + { return getEPackageRef(); + } return basicGetEPackageRef(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java index be3b93e3be..1cb2952d1b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java @@ -84,7 +84,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public static Model3Package init() { if (isInited) + { return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI); + } // Obtain or create and register package Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE @@ -183,7 +185,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -210,7 +214,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java index 4abf86e2df..660011cb18 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/impl/SubpackagePackageImpl.java @@ -76,7 +76,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac public static SubpackagePackage init() { if (isInited) + { return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI); + } // Obtain or create and register package SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE @@ -155,7 +157,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -179,7 +183,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java index 173208ba4f..0998561008 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java @@ -97,7 +97,9 @@ public class SubpackageSwitch Class2 class2 = (Class2)theEObject; T result = caseClass2(class2); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java index ec6bdb5cad..07f0e0ab25 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java @@ -98,7 +98,9 @@ public class Model3Switch Class1 class1 = (Class1)theEObject; T result = caseClass1(class1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model3Package.META_REF: @@ -106,7 +108,9 @@ public class Model3Switch MetaRef metaRef = (MetaRef)theEObject; T result = caseMetaRef(metaRef); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: 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 658d6212d2..18a450a325 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 @@ -84,7 +84,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public static Model3Package init() { if (isInited) + { return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI); + } // Obtain or create and register package Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE @@ -183,7 +185,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -210,7 +214,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java index 10780e8e8f..946cba6e12 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java @@ -76,7 +76,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac public static SubpackagePackage init() { if (isInited) + { return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI); + } // Obtain or create and register package SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE @@ -155,7 +157,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -179,7 +183,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package 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 868ca1f276..85810e7186 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 @@ -97,7 +97,9 @@ public class SubpackageSwitch Class2 class2 = (Class2)theEObject; T result = caseClass2(class2); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: 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 17588e2e16..aa6e59a2ec 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 @@ -98,7 +98,9 @@ public class Model3Switch Class1 class1 = (Class1)theEObject; T result = caseClass1(class1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model3Package.META_REF: @@ -106,7 +108,9 @@ public class Model3Switch MetaRef metaRef = (MetaRef)theEObject; T result = caseMetaRef(metaRef); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java index 8270478b21..aa09521424 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java @@ -92,8 +92,10 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, oldName, name)); + } } /** @@ -171,7 +173,9 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java index 0952d8f409..26b883baf7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java @@ -111,9 +111,13 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN { case model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS: if (coreType) + { return getElements(); + } else + { return getElements().map(); + } } return super.eGet(featureID, resolve, coreType); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java index fdd2cf59cc..93d89fb29e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java @@ -90,9 +90,13 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -108,18 +112,26 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement)); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java index 42abbd16b2..2a66b26452 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java @@ -79,8 +79,10 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); + } } } return element; @@ -106,8 +108,10 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS EObject oldElement = element; element = newElement; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); + } } /** @@ -122,7 +126,9 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS { case model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java index 7dc23be114..19b60383bf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java @@ -94,8 +94,10 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, name)); + } } /** @@ -215,7 +217,9 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java index 2ebc58771a..05b893703f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java @@ -86,7 +86,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public IMultiRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT) + { return null; + } return (IMultiRefContainer)eContainer(); } @@ -109,23 +111,33 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public void setParent(IMultiRefContainer newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null)) + || eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS, IMultiRefContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -148,8 +160,10 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -164,7 +178,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp { case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((IMultiRefContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -288,7 +304,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java index 914dd5b51b..a2d7b81fa6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java @@ -102,8 +102,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -133,9 +135,13 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -151,18 +157,26 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -185,8 +199,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -201,8 +217,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); + } return basicSetParent((IMultiRefNonContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -236,7 +254,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME: return getName(); @@ -311,7 +331,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java index 3485d971f0..4e33bc4565 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java @@ -86,7 +86,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public ISingleRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT) + { return null; + } return (ISingleRefContainer)eContainer(); } @@ -109,23 +111,33 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public void setParent(ISingleRefContainer newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null)) + || eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT, ISingleRefContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -148,8 +160,10 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -164,7 +178,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im { case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((ISingleRefContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -288,7 +304,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java index a6874d33b6..1fd4014df0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java @@ -91,9 +91,13 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -109,18 +113,26 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, newElement, newElement)); + } } /** @@ -135,8 +147,10 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl { case model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT: if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs); + } return basicSetElement((ISingleRefContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java index 3d94e68386..e78fbc3894 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java @@ -90,9 +90,13 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -108,18 +112,26 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, newElement, newElement)); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java index 3252e5a704..851692c1bd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java @@ -102,8 +102,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -133,9 +135,13 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -151,18 +157,26 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -185,8 +199,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -201,8 +217,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); + } return basicSetParent((ISingleRefNonContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -236,7 +254,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME: return getName(); @@ -311,7 +331,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java index b19c555535..fd43abcbda 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java @@ -81,8 +81,10 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, element)); + } } } return element; @@ -112,9 +114,13 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -130,20 +136,28 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, newElement, newElement)); + } } /** @@ -158,9 +172,11 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT: if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); + } return basicSetElement((ISingleRefNonContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -194,7 +210,9 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java index 3cdf9e3eb8..6b3abb8ccb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java @@ -80,8 +80,10 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element)); + } } } return element; @@ -107,8 +109,10 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp IContainedElementNoParentLink oldElement = element; element = newElement; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element)); + } } /** @@ -123,7 +127,9 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java index b710191e0c..41942ed3c3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java @@ -97,7 +97,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -108,7 +110,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public RefMultiContained getParent() { if (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT) + { return null; + } return (RefMultiContained)eContainer(); } @@ -130,24 +134,34 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta */ public void setParent(RefMultiContained newParent) { - if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null)) + if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT + && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS, RefMultiContained.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -162,7 +176,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta { case model4Package.MULTI_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((RefMultiContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -286,7 +302,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java index 043d2c92df..6a85003729 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java @@ -106,8 +106,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -124,8 +126,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -155,9 +159,13 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -173,18 +181,26 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -199,8 +215,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo { case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); + } return basicSetParent((RefMultiNonContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -236,7 +254,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo return getName(); case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -309,7 +329,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java index 3996619481..4b0084ec80 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java @@ -116,8 +116,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, oldName, name)); + } } /** @@ -134,8 +136,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -167,9 +171,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, newParent, !oldParentESet); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -185,22 +193,30 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else { boolean oldParentESet = parentESet; parentESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent, newParent, !oldParentESet)); + } } } @@ -220,9 +236,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, null, oldParentESet); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -241,15 +261,19 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen RefMultiNonContainedUnsettable.class, msgs); msgs = basicUnsetParent(msgs); if (msgs != null) + { msgs.dispatch(); + } } else { boolean oldParentESet = parentESet; parentESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, null, null, oldParentESet)); + } } } @@ -275,8 +299,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen { case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); + } return basicSetParent((RefMultiNonContainedUnsettable)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -312,7 +338,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen return getName(); case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -385,7 +413,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java index 0f9bf33b13..b1cd7ac79b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java @@ -94,7 +94,9 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R public void unsetElements() { if (elements != null) + { ((InternalEList.Unsettable)elements).unset(); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java index b7e79e8305..b7616b84c3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java @@ -90,9 +90,13 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -108,18 +112,26 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement)); + } } /** @@ -134,8 +146,10 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont { case model4Package.REF_SINGLE_CONTAINED__ELEMENT: if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs); + } return basicSetElement((SingleContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java index 0e96f3e771..90d7c72a98 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java @@ -90,9 +90,13 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -108,18 +112,26 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement, newElement)); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java index 8b08ae6133..7429862a56 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java @@ -80,8 +80,10 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); + } } } return element; @@ -111,9 +113,13 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -129,18 +135,26 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement, newElement)); + } } /** @@ -155,8 +169,10 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT: if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); + } return basicSetElement((SingleNonContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -190,7 +206,9 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java index 135cb11dd9..c3f2ac7a1b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java @@ -79,8 +79,10 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element)); + } } } return element; @@ -106,8 +108,10 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing ContainedElementNoOpposite oldElement = element; element = newElement; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element)); + } } /** @@ -122,7 +126,9 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing { case model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java index 7a7422703a..3c5311feb6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java @@ -97,7 +97,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -108,7 +110,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public RefSingleContained getParent() { if (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT) + { return null; + } return (RefSingleContained)eContainer(); } @@ -130,24 +134,34 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon */ public void setParent(RefSingleContained newParent) { - if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null)) + if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT + && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT, RefSingleContained.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -162,7 +176,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon { case model4Package.SINGLE_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((RefSingleContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -286,7 +302,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java index beffbf5fa7..83a8b17809 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java @@ -106,8 +106,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -124,8 +126,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -155,9 +159,13 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -173,18 +181,26 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -199,8 +215,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single { case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); + } return basicSetParent((RefSingleNonContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -236,7 +254,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single return getName(); case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -309,7 +329,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java index 3c296f5f84..9b2c1bf0f0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java @@ -106,7 +106,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__KEY, oldKey, key)); + } } /** @@ -129,7 +131,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< EObject oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__VALUE, oldValue, value)); + } } /** @@ -217,7 +221,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -243,7 +249,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< if (hash == -1) { Object theKey = getKey(); - hash = (theKey == null ? 0 : theKey.hashCode()); + hash = theKey == null ? 0 : theKey.hashCode(); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java index b919b1a3ef..f533a28cd7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java @@ -348,7 +348,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public static model4Package init() { if (isInited) + { return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI); + } // Obtain or create and register package model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE @@ -1070,7 +1072,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -1193,7 +1197,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -1231,25 +1237,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Initialize classes and features; add operations and parameters initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), this - .getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), + "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), this - .getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), + "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), this - .getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), + getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1258,32 +1262,30 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), this - .getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), + getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), this - .getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), + "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(), - this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), + "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), this - .getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), + getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1292,15 +1294,14 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), this - .getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), + "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), this - .getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, + initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(), + getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1309,33 +1310,33 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(), this - .getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, + initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), + getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0, - 1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, + RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, - 0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, + RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, + RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, - 0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, + -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", @@ -1427,7 +1428,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java index fac11daa5e..4b8f8421ee 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java @@ -145,7 +145,9 @@ public class model4Switch RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: @@ -153,7 +155,9 @@ public class model4Switch SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: @@ -161,7 +165,9 @@ public class model4Switch RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: @@ -169,7 +175,9 @@ public class model4Switch SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_CONTAINED: @@ -177,7 +185,9 @@ public class model4Switch RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: @@ -185,7 +195,9 @@ public class model4Switch MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED: @@ -193,7 +205,9 @@ public class model4Switch RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: @@ -201,7 +215,9 @@ public class model4Switch MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE: @@ -209,7 +225,9 @@ public class model4Switch RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject; T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT: @@ -217,7 +235,9 @@ public class model4Switch MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject; T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: @@ -225,7 +245,9 @@ public class model4Switch RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: @@ -233,7 +255,9 @@ public class model4Switch RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: @@ -241,7 +265,9 @@ public class model4Switch RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: @@ -249,7 +275,9 @@ public class model4Switch RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: @@ -257,7 +285,9 @@ public class model4Switch ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: @@ -265,7 +295,9 @@ public class model4Switch GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: @@ -273,7 +305,9 @@ public class model4Switch GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: @@ -281,7 +315,9 @@ public class model4Switch GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: @@ -289,7 +325,9 @@ public class model4Switch GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: @@ -297,9 +335,13 @@ public class model4Switch ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject; T result = caseImplSingleRefContainer(implSingleRefContainer); if (result == null) + { result = caseISingleRefContainer(implSingleRefContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT: @@ -307,9 +349,13 @@ public class model4Switch ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject; T result = caseImplSingleRefContainedElement(implSingleRefContainedElement); if (result == null) + { result = caseISingleRefContainedElement(implSingleRefContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER: @@ -317,9 +363,13 @@ public class model4Switch ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject; T result = caseImplSingleRefNonContainer(implSingleRefNonContainer); if (result == null) + { result = caseISingleRefNonContainer(implSingleRefNonContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT: @@ -327,9 +377,13 @@ public class model4Switch ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject; T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement); if (result == null) + { result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER: @@ -337,9 +391,13 @@ public class model4Switch ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject; T result = caseImplMultiRefNonContainer(implMultiRefNonContainer); if (result == null) + { result = caseIMultiRefNonContainer(implMultiRefNonContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT: @@ -347,9 +405,13 @@ public class model4Switch ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject; T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement); if (result == null) + { result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER: @@ -357,9 +419,13 @@ public class model4Switch ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject; T result = caseImplMultiRefContainer(implMultiRefContainer); if (result == null) + { result = caseIMultiRefContainer(implMultiRefContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT: @@ -367,9 +433,13 @@ public class model4Switch ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject; T result = caseImplMultiRefContainedElement(implMultiRefContainedElement); if (result == null) + { result = caseIMultiRefContainedElement(implMultiRefContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL: @@ -377,9 +447,13 @@ public class model4Switch ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject; T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL); if (result == null) + { result = caseISingleRefContainerNPL(implSingleRefContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL: @@ -387,9 +461,13 @@ public class model4Switch ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject; T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL); if (result == null) + { result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER_NPL: @@ -397,9 +475,13 @@ public class model4Switch ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject; T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL); if (result == null) + { result = caseIMultiRefContainerNPL(implMultiRefContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL: @@ -407,9 +489,13 @@ public class model4Switch ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject; T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL); if (result == null) + { result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_CONTAINED_ELEMENT_NPL: @@ -417,11 +503,17 @@ public class model4Switch ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject; T result = caseImplContainedElementNPL(implContainedElementNPL); if (result == null) + { result = caseIContainedElementNoParentLink(implContainedElementNPL); + } if (result == null) + { result = caseINamedElement(implContainedElementNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED: @@ -429,7 +521,9 @@ public class model4Switch GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject; T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MAP_NON_CONTAINED: @@ -437,7 +531,9 @@ public class model4Switch GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject; T result = caseGenRefMapNonContained(genRefMapNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.STRING_TO_EOBJECT: @@ -446,7 +542,9 @@ public class model4Switch Map.Entry stringToEObject = (Map.Entry)theEObject; T result = caseStringToEObject(stringToEObject); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java index 2911b884ad..418625b9ca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java @@ -123,7 +123,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr if (hash == -1) { Object theKey = getKey(); - hash = (theKey == null ? 0 : theKey.hashCode()); + hash = theKey == null ? 0 : theKey.hashCode(); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java index 34f661b872..057e367494 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java @@ -348,7 +348,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public static model4Package init() { if (isInited) + { return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI); + } // Obtain or create and register package model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE @@ -1070,7 +1072,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -1193,7 +1197,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -1231,25 +1237,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Initialize classes and features; add operations and parameters initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), this - .getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), + "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), this - .getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), + "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), this - .getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), + getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1258,32 +1262,30 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), this - .getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), + getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), this - .getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), + "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(), - this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), + "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), this - .getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), + getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1292,15 +1294,14 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), this - .getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), + "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), this - .getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, + initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(), + getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1309,33 +1310,33 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(), this - .getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, + initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), + getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0, - 1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, + RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, - 0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, + RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, + RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, - 0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, + -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", @@ -1427,7 +1428,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java index 0fce95e580..a593504a11 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java @@ -145,7 +145,9 @@ public class model4Switch RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: @@ -153,7 +155,9 @@ public class model4Switch SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: @@ -161,7 +165,9 @@ public class model4Switch RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: @@ -169,7 +175,9 @@ public class model4Switch SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_CONTAINED: @@ -177,7 +185,9 @@ public class model4Switch RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: @@ -185,7 +195,9 @@ public class model4Switch MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED: @@ -193,7 +205,9 @@ public class model4Switch RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: @@ -201,7 +215,9 @@ public class model4Switch MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE: @@ -209,7 +225,9 @@ public class model4Switch RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject; T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT: @@ -217,7 +235,9 @@ public class model4Switch MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject; T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: @@ -225,7 +245,9 @@ public class model4Switch RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: @@ -233,7 +255,9 @@ public class model4Switch RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: @@ -241,7 +265,9 @@ public class model4Switch RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: @@ -249,7 +275,9 @@ public class model4Switch RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: @@ -257,7 +285,9 @@ public class model4Switch ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: @@ -265,7 +295,9 @@ public class model4Switch GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: @@ -273,7 +305,9 @@ public class model4Switch GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: @@ -281,7 +315,9 @@ public class model4Switch GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: @@ -289,7 +325,9 @@ public class model4Switch GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: @@ -297,9 +335,13 @@ public class model4Switch ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject; T result = caseImplSingleRefContainer(implSingleRefContainer); if (result == null) + { result = caseISingleRefContainer(implSingleRefContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT: @@ -307,9 +349,13 @@ public class model4Switch ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject; T result = caseImplSingleRefContainedElement(implSingleRefContainedElement); if (result == null) + { result = caseISingleRefContainedElement(implSingleRefContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER: @@ -317,9 +363,13 @@ public class model4Switch ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject; T result = caseImplSingleRefNonContainer(implSingleRefNonContainer); if (result == null) + { result = caseISingleRefNonContainer(implSingleRefNonContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT: @@ -327,9 +377,13 @@ public class model4Switch ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject; T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement); if (result == null) + { result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER: @@ -337,9 +391,13 @@ public class model4Switch ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject; T result = caseImplMultiRefNonContainer(implMultiRefNonContainer); if (result == null) + { result = caseIMultiRefNonContainer(implMultiRefNonContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT: @@ -347,9 +405,13 @@ public class model4Switch ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject; T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement); if (result == null) + { result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER: @@ -357,9 +419,13 @@ public class model4Switch ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject; T result = caseImplMultiRefContainer(implMultiRefContainer); if (result == null) + { result = caseIMultiRefContainer(implMultiRefContainer); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT: @@ -367,9 +433,13 @@ public class model4Switch ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject; T result = caseImplMultiRefContainedElement(implMultiRefContainedElement); if (result == null) + { result = caseIMultiRefContainedElement(implMultiRefContainedElement); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL: @@ -377,9 +447,13 @@ public class model4Switch ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject; T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL); if (result == null) + { result = caseISingleRefContainerNPL(implSingleRefContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL: @@ -387,9 +461,13 @@ public class model4Switch ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject; T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL); if (result == null) + { result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER_NPL: @@ -397,9 +475,13 @@ public class model4Switch ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject; T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL); if (result == null) + { result = caseIMultiRefContainerNPL(implMultiRefContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL: @@ -407,9 +489,13 @@ public class model4Switch ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject; T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL); if (result == null) + { result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.IMPL_CONTAINED_ELEMENT_NPL: @@ -417,11 +503,17 @@ public class model4Switch ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject; T result = caseImplContainedElementNPL(implContainedElementNPL); if (result == null) + { result = caseIContainedElementNoParentLink(implContainedElementNPL); + } if (result == null) + { result = caseINamedElement(implContainedElementNPL); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED: @@ -429,7 +521,9 @@ public class model4Switch GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject; T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.GEN_REF_MAP_NON_CONTAINED: @@ -437,7 +531,9 @@ public class model4Switch GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject; T result = caseGenRefMapNonContained(genRefMapNonContained); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4Package.STRING_TO_EOBJECT: @@ -446,7 +542,9 @@ public class model4Switch Map.Entry stringToEObject = (Map.Entry)theEObject; T result = caseStringToEObject(stringToEObject); 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/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 e01573d393..585486f33b 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,7 +178,9 @@ 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 @@ -497,7 +499,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -559,7 +563,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -576,57 +582,55 @@ 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(), this.getISingleRefContainedElement(), this - .getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, + initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), + 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(), 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); + 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); initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), this - .getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT, + 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); initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), this - .getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT, + 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); initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), this - .getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, + initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), + 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(), 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); + 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); initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), this - .getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT, + 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); initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), this - .getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT, + 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); @@ -640,26 +644,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - 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); + 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); initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", - null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getISingleRefNonContainerNPL_Element(), 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(), 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); + 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); initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", - null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getIMultiRefNonContainerNPL_Elements(), 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/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java index f033e9d2ac..87a9560533 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,7 +110,9 @@ 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: @@ -118,7 +120,9 @@ 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: @@ -126,7 +130,9 @@ 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: @@ -134,7 +140,9 @@ public class model4interfacesSwitch ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: @@ -142,7 +150,9 @@ 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: @@ -150,7 +160,9 @@ 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: @@ -158,7 +170,9 @@ 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: @@ -166,7 +180,9 @@ public class model4interfacesSwitch IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.INAMED_ELEMENT: @@ -174,7 +190,9 @@ 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: @@ -182,7 +200,9 @@ 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: @@ -190,7 +210,9 @@ 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: @@ -198,7 +220,9 @@ 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: @@ -206,7 +230,9 @@ 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: @@ -214,7 +240,9 @@ 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 ba4e5a0beb..f4cea2a354 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,7 +178,9 @@ 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 @@ -497,7 +499,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -559,7 +563,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -576,57 +582,55 @@ 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(), this.getISingleRefContainedElement(), this - .getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, + initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), + 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(), 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); + 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); initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), this - .getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT, + 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); initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), this - .getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT, + 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); initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), this - .getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, + initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), + 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(), 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); + 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); initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), this - .getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT, + 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); initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), this - .getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT, + 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); @@ -640,26 +644,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - 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); + 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); initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", - null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getISingleRefNonContainerNPL_Element(), 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(), 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); + 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); initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", - null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getIMultiRefNonContainerNPL_Elements(), 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/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java index 0ce686ad3f..4c83511145 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,7 +110,9 @@ 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: @@ -118,7 +120,9 @@ 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: @@ -126,7 +130,9 @@ 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: @@ -134,7 +140,9 @@ public class model4interfacesSwitch ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: @@ -142,7 +150,9 @@ 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: @@ -150,7 +160,9 @@ 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: @@ -158,7 +170,9 @@ 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: @@ -166,7 +180,9 @@ public class model4interfacesSwitch IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); if (result == null) + { result = defaultCase(theEObject); + } return result; } case model4interfacesPackage.INAMED_ELEMENT: @@ -174,7 +190,9 @@ 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: @@ -182,7 +200,9 @@ 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: @@ -190,7 +210,9 @@ 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: @@ -198,7 +220,9 @@ 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: @@ -206,7 +230,9 @@ 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: @@ -214,7 +240,9 @@ 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.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java index 1bbda6a305..5bce3dc272 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java @@ -163,7 +163,9 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java index b4d7726ea1..ef363edd8a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java @@ -163,7 +163,9 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java index 3869b7d6aa..9a975bb6e8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java @@ -164,7 +164,9 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java index 74971fdb55..37b965402a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java @@ -163,7 +163,9 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java index a8f7b5823b..8fedcc89cf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java @@ -163,7 +163,9 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java index c5f5bb29ac..e3dc5a9ea6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java @@ -163,7 +163,9 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java index c1c56c9562..6c5c329139 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java @@ -163,7 +163,9 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java index 30f78761e4..1fb6f8c817 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java @@ -163,7 +163,9 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java index 12499fb882..3ab8cf5b29 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java @@ -163,7 +163,9 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java index 66502cb903..d1c75a7edb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java @@ -163,7 +163,9 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (elements: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java index 300006949f..0a671ec253 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java @@ -177,7 +177,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package public static Model5Package init() { if (isInited) + { return (Model5Package)EPackage.Registry.INSTANCE.getEPackage(Model5Package.eNS_URI); + } // Obtain or create and register package Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE @@ -486,7 +488,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -546,7 +550,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -563,10 +569,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package // Initialize classes and features; add operations and parameters initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTestFeatureMap_Managers(), this.getManager(), null, "managers", null, 0, -1, - TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTestFeatureMap_Doctors(), this.getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, + initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class, + IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1, diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java index 7cb052acc5..970cb927e5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java @@ -178,7 +178,9 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap return getDoctors(); case Model5Package.TEST_FEATURE_MAP__PEOPLE: if (coreType) + { return getPeople(); + } return ((FeatureMap.Internal)getPeople()).getWrapper(); } return super.eGet(featureID, resolve, coreType); @@ -262,7 +264,9 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (people: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java index 9543d141c8..d2d594d41c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java @@ -116,7 +116,9 @@ public class Model5Switch TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject; T result = caseTestFeatureMap(testFeatureMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.MANAGER: @@ -124,7 +126,9 @@ public class Model5Switch Manager manager = (Manager)theEObject; T result = caseManager(manager); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.DOCTOR: @@ -132,7 +136,9 @@ public class Model5Switch Doctor doctor = (Doctor)theEObject; T result = caseDoctor(doctor); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_STRING: @@ -140,7 +146,9 @@ public class Model5Switch GenListOfString genListOfString = (GenListOfString)theEObject; T result = caseGenListOfString(genListOfString); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_INT: @@ -148,7 +156,9 @@ public class Model5Switch GenListOfInt genListOfInt = (GenListOfInt)theEObject; T result = caseGenListOfInt(genListOfInt); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_INTEGER: @@ -156,7 +166,9 @@ public class Model5Switch GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject; T result = caseGenListOfInteger(genListOfInteger); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_LONG: @@ -164,7 +176,9 @@ public class Model5Switch GenListOfLong genListOfLong = (GenListOfLong)theEObject; T result = caseGenListOfLong(genListOfLong); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_BOOLEAN: @@ -172,7 +186,9 @@ public class Model5Switch GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject; T result = caseGenListOfBoolean(genListOfBoolean); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_SHORT: @@ -180,7 +196,9 @@ public class Model5Switch GenListOfShort genListOfShort = (GenListOfShort)theEObject; T result = caseGenListOfShort(genListOfShort); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_FLOAT: @@ -188,7 +206,9 @@ public class Model5Switch GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject; T result = caseGenListOfFloat(genListOfFloat); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_DOUBLE: @@ -196,7 +216,9 @@ public class Model5Switch GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject; T result = caseGenListOfDouble(genListOfDouble); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_DATE: @@ -204,7 +226,9 @@ public class Model5Switch GenListOfDate genListOfDate = (GenListOfDate)theEObject; T result = caseGenListOfDate(genListOfDate); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_CHAR: @@ -212,7 +236,9 @@ public class Model5Switch GenListOfChar genListOfChar = (GenListOfChar)theEObject; T result = caseGenListOfChar(genListOfChar); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java index 1f907dd3ed..18572cb45b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java @@ -177,7 +177,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package public static Model5Package init() { if (isInited) + { return (Model5Package)EPackage.Registry.INSTANCE.getEPackage(Model5Package.eNS_URI); + } // Obtain or create and register package Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE @@ -486,7 +488,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -546,7 +550,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -563,10 +569,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package // Initialize classes and features; add operations and parameters initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTestFeatureMap_Managers(), this.getManager(), null, "managers", null, 0, -1, - TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTestFeatureMap_Doctors(), this.getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, + initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class, + IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1, diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java index 6069a3dc8f..802b101ff3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java @@ -116,7 +116,9 @@ public class Model5Switch TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject; T result = caseTestFeatureMap(testFeatureMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.MANAGER: @@ -124,7 +126,9 @@ public class Model5Switch Manager manager = (Manager)theEObject; T result = caseManager(manager); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.DOCTOR: @@ -132,7 +136,9 @@ public class Model5Switch Doctor doctor = (Doctor)theEObject; T result = caseDoctor(doctor); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_STRING: @@ -140,7 +146,9 @@ public class Model5Switch GenListOfString genListOfString = (GenListOfString)theEObject; T result = caseGenListOfString(genListOfString); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_INT: @@ -148,7 +156,9 @@ public class Model5Switch GenListOfInt genListOfInt = (GenListOfInt)theEObject; T result = caseGenListOfInt(genListOfInt); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_INTEGER: @@ -156,7 +166,9 @@ public class Model5Switch GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject; T result = caseGenListOfInteger(genListOfInteger); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_LONG: @@ -164,7 +176,9 @@ public class Model5Switch GenListOfLong genListOfLong = (GenListOfLong)theEObject; T result = caseGenListOfLong(genListOfLong); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_BOOLEAN: @@ -172,7 +186,9 @@ public class Model5Switch GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject; T result = caseGenListOfBoolean(genListOfBoolean); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_SHORT: @@ -180,7 +196,9 @@ public class Model5Switch GenListOfShort genListOfShort = (GenListOfShort)theEObject; T result = caseGenListOfShort(genListOfShort); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_FLOAT: @@ -188,7 +206,9 @@ public class Model5Switch GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject; T result = caseGenListOfFloat(genListOfFloat); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_DOUBLE: @@ -196,7 +216,9 @@ public class Model5Switch GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject; T result = caseGenListOfDouble(genListOfDouble); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_DATE: @@ -204,7 +226,9 @@ public class Model5Switch GenListOfDate genListOfDate = (GenListOfDate)theEObject; T result = caseGenListOfDate(genListOfDate); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model5Package.GEN_LIST_OF_CHAR: @@ -212,7 +236,9 @@ public class Model5Switch GenListOfChar genListOfChar = (GenListOfChar)theEObject; T result = caseGenListOfChar(genListOfChar); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java index 553b728641..dfe84b432c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/base/impl/BasePackageImpl.java @@ -73,7 +73,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage public static BasePackage init() { if (isInited) + { return (BasePackage)EPackage.Registry.INSTANCE.getEPackage(BasePackage.eNS_URI); + } // Obtain or create and register package BasePackageImpl theBasePackage = (BasePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BasePackageImpl ? EPackage.Registry.INSTANCE @@ -142,7 +144,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -166,7 +170,9 @@ public class BasePackageImpl extends EPackageImpl implements BasePackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java index 6c1b068c70..ceaab178b7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/base/util/BaseSwitch.java @@ -97,7 +97,9 @@ public class BaseSwitch BaseClass baseClass = (BaseClass)theEObject; T result = caseBaseClass(baseClass); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java index 13cdd12f3a..5cef3afe96 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/impl/DerivedPackageImpl.java @@ -73,7 +73,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage public static DerivedPackage init() { if (isInited) + { return (DerivedPackage)EPackage.Registry.INSTANCE.getEPackage(DerivedPackage.eNS_URI); + } // Obtain or create and register package DerivedPackageImpl theDerivedPackage = (DerivedPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DerivedPackageImpl ? EPackage.Registry.INSTANCE @@ -135,7 +137,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -158,7 +162,9 @@ public class DerivedPackageImpl extends EPackageImpl implements DerivedPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java index 4b456ce4cd..669b75b3d7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/derived/util/DerivedSwitch.java @@ -98,9 +98,13 @@ public class DerivedSwitch DerivedClass derivedClass = (DerivedClass)theEObject; T result = caseDerivedClass(derivedClass); if (result == null) + { result = caseBaseClass(derivedClass); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java index 0fda8209f5..ac4c5773fb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/impl/InterfacePackageImpl.java @@ -73,7 +73,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka public static InterfacePackage init() { if (isInited) + { return (InterfacePackage)EPackage.Registry.INSTANCE.getEPackage(InterfacePackage.eNS_URI); + } // Obtain or create and register package InterfacePackageImpl theInterfacePackage = (InterfacePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InterfacePackageImpl ? EPackage.Registry.INSTANCE @@ -142,7 +144,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -166,7 +170,9 @@ public class InterfacePackageImpl extends EPackageImpl implements InterfacePacka public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java index 9d14d082d5..b0539de7ef 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/interface_/util/InterfaceSwitch.java @@ -97,7 +97,9 @@ public class InterfaceSwitch IInterface iInterface = (IInterface)theEObject; T result = caseIInterface(iInterface); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java index b5020089a9..783fe6b5dc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/impl/ReferencePackageImpl.java @@ -74,7 +74,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka public static ReferencePackage init() { if (isInited) + { return (ReferencePackage)EPackage.Registry.INSTANCE.getEPackage(ReferencePackage.eNS_URI); + } // Obtain or create and register package ReferencePackageImpl theReferencePackage = (ReferencePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferencePackageImpl ? EPackage.Registry.INSTANCE @@ -146,7 +148,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -170,7 +174,9 @@ public class ReferencePackageImpl extends EPackageImpl implements ReferencePacka public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java index 87ee55c612..043e42d176 100644 --- a/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests/model/reference/util/ReferenceSwitch.java @@ -97,7 +97,9 @@ public class ReferenceSwitch Reference reference = (Reference)theEObject; T result = caseReference(reference); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java index f5793afea6..3b734337cc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java @@ -414,7 +414,7 @@ public class CrossReferenceTest extends AbstractCDOTest externalResource.getContents().add(customer); transaction.commit(); - CDORevisionData data = (CDOUtil.getCDOObject(salesOrder)).cdoRevision().data(); + CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data(); CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0); assertTrue(id.isExternal()); } @@ -445,7 +445,7 @@ public class CrossReferenceTest extends AbstractCDOTest company.getCustomers().add(customer); transaction.commit(); - CDORevisionData data = (CDOUtil.getCDOObject(salesOrder)).cdoRevision().data(); + CDORevisionData data = CDOUtil.getCDOObject(salesOrder).cdoRevision().data(); CDOID id = (CDOID)data.get(getModel1Package().getSalesOrder_Customer(), 0); assertFalse(id.isExternal()); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java index 3ed8c539c6..bafa62b33e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java @@ -87,7 +87,7 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest assertDirty(detail1, transaction); transaction.commit(); - assertEquals(id, (CDOUtil.getCDOObject(detail1)).cdoID()); + assertEquals(id, CDOUtil.getCDOObject(detail1).cdoID()); assertEquals(detail1, transaction.getObject(id)); assertClean(detail1, transaction); } diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java index 3c02bf454e..9669ac3993 100644 --- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java @@ -185,8 +185,10 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef if (cdoView != oldCdoView) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW, oldCdoView, cdoView)); + } } } return cdoView; @@ -212,8 +214,10 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef CDOViewDef oldCdoView = cdoView; cdoView = newCdoView; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW, oldCdoView, cdoView)); + } } /** @@ -236,8 +240,10 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef String oldResourcePath = resourcePath; resourcePath = newResourcePath; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH, oldResourcePath, resourcePath)); + } } /** @@ -252,7 +258,9 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef { case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW: if (resolve) + { return getCdoView(); + } return basicGetCdoView(); case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH: return getResourcePath(); @@ -327,7 +335,9 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourcePath: "); diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java index 82eec3039f..102fb243c8 100644 --- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java @@ -86,7 +86,9 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka public static CDOUIDefsPackage init() { if (isInited) + { return (CDOUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDOUIDefsPackage.eNS_URI); + } // Obtain or create and register package CDOUIDefsPackageImpl theCDOUIDefsPackage = (CDOUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE @@ -188,7 +190,9 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -216,7 +220,9 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -235,7 +241,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka // Add supertypes to classes editorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoEditorDefEClass.getESuperTypes().add(this.getEditorDef()); + cdoEditorDefEClass.getESuperTypes().add(getEditorDef()); // Initialize classes and features; add operations and parameters initEClass(editorDefEClass, EditorDef.class, "EditorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java index 8296e7d83a..014c42cc83 100644 --- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java @@ -95,8 +95,10 @@ public class EditorDefImpl extends DefImpl implements EditorDef String oldEditorID = editorID; editorID = newEditorID; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID, oldEditorID, editorID)); + } } /** @@ -174,7 +176,9 @@ public class EditorDefImpl extends DefImpl implements EditorDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (editorID: "); diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java index 1812316a3e..3b43c1e35d 100644 --- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java +++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java @@ -103,9 +103,13 @@ public class CDOUIDefsSwitch EditorDef editorDef = (EditorDef)theEObject; T result = caseEditorDef(editorDef); if (result == null) + { result = caseDef(editorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case CDOUIDefsPackage.CDO_EDITOR_DEF: @@ -113,11 +117,17 @@ public class CDOUIDefsSwitch CDOEditorDef cdoEditorDef = (CDOEditorDef)theEObject; T result = caseCDOEditorDef(cdoEditorDef); if (result == null) + { result = caseEditorDef(cdoEditorDef); + } if (result == null) + { result = caseDef(cdoEditorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java index 399a9461ca..4447a16a8f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java @@ -115,7 +115,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka public static EresourcePackage init() { if (isInited) + { return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI); + } // Obtain or create and register package EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE @@ -363,7 +365,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -408,7 +412,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -424,16 +430,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka // Set bounds for type parameters // Add supertypes to classes - cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode()); - cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode()); + cdoResourceFolderEClass.getESuperTypes().add(getCDOResourceNode()); + cdoResourceEClass.getESuperTypes().add(getCDOResourceNode()); // Initialize classes and features; add operations and parameters initEClass(cdoResourceNodeEClass, CDOResourceNode.class, "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference( getCDOResourceNode_Folder(), - this.getCDOResourceFolder(), - this.getCDOResourceFolder_Nodes(), + getCDOResourceFolder(), + getCDOResourceFolder_Nodes(), "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResourceNode_Name(), @@ -448,19 +454,19 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference( getCDOResourceFolder_Nodes(), - this.getCDOResourceNode(), - this.getCDOResourceNode_Folder(), + getCDOResourceNode(), + getCDOResourceNode_Folder(), "nodes", null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute( getCDOResource_ResourceSet(), - this.getResourceSet(), + getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_URI(), - this.getURI(), + getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference( getCDOResource_Contents(), @@ -481,11 +487,11 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka "trackingModification", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_Errors(), - this.getDiagnostic(), + getDiagnostic(), "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_Warnings(), - this.getDiagnostic(), + getDiagnostic(), "warnings", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute( getCDOResource_TimeStamp(), diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java index 3c9cebd6d4..7332ab2f71 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java @@ -135,8 +135,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef if (bufferProvider != oldBufferProvider) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER, oldBufferProvider, bufferProvider)); + } } } return bufferProvider; @@ -162,8 +164,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef BufferPoolDef oldBufferProvider = bufferProvider; bufferProvider = newBufferProvider; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER, oldBufferProvider, bufferProvider)); + } } /** @@ -180,8 +184,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef if (executorService != oldExecutorService) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE, oldExecutorService, executorService)); + } } } return executorService; @@ -207,8 +213,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef ThreadPoolDef oldExecutorService = executorService; executorService = newExecutorService; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE, oldExecutorService, executorService)); + } } /** @@ -225,8 +233,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef if (negotiator != oldNegotiator) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator, negotiator)); + } } } return negotiator; @@ -254,8 +264,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef boolean oldNegotiatorESet = negotiatorESet; negotiatorESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator, negotiator, !oldNegotiatorESet)); + } } /** @@ -270,8 +282,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef negotiator = null; negotiatorESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator, null, oldNegotiatorESet)); + } } /** @@ -307,7 +321,9 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef public void unsetServerProtocolProvider() { if (serverProtocolProvider != null) + { ((InternalEList.Unsettable)serverProtocolProvider).unset(); + } } /** @@ -332,15 +348,21 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef { case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER: if (resolve) + { return getBufferProvider(); + } return basicGetBufferProvider(); case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE: if (resolve) + { return getExecutorService(); + } return basicGetExecutorService(); case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR: if (resolve) + { return getNegotiator(); + } return basicGetNegotiator(); case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER: return getServerProtocolProvider(); diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java index 614e958d95..fc71067857 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java @@ -173,8 +173,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef boolean oldUserIDESet = userIDESet; userIDESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID, userID, !oldUserIDESet)); + } } /** @@ -189,8 +191,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef userID = USER_ID_EDEFAULT; userIDESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID, USER_ID_EDEFAULT, oldUserIDESet)); + } } /** @@ -217,8 +221,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef if (bufferProvider != oldBufferProvider) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER, oldBufferProvider, bufferProvider)); + } } } return bufferProvider; @@ -244,8 +250,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef BufferProviderDef oldBufferProvider = bufferProvider; bufferProvider = newBufferProvider; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER, oldBufferProvider, bufferProvider)); + } } /** @@ -262,8 +270,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef if (executorService != oldExecutorService) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE, oldExecutorService, executorService)); + } } } return executorService; @@ -289,8 +299,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef ExecutorServiceDef oldExecutorService = executorService; executorService = newExecutorService; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE, oldExecutorService, executorService)); + } } /** @@ -307,8 +319,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef if (negotiator != oldNegotiator) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator, negotiator)); + } } } return negotiator; @@ -336,8 +350,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef boolean oldNegotiatorESet = negotiatorESet; negotiatorESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator, negotiator, !oldNegotiatorESet)); + } } /** @@ -352,8 +368,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef negotiator = null; negotiatorESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator, null, oldNegotiatorESet)); + } } /** @@ -389,7 +407,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef public void unsetClientProtocolProvider() { if (clientProtocolProvider != null) + { ((InternalEList.Unsettable)clientProtocolProvider).unset(); + } } /** @@ -416,15 +436,21 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef return getUserID(); case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER: if (resolve) + { return getBufferProvider(); + } return basicGetBufferProvider(); case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE: if (resolve) + { return getExecutorService(); + } return basicGetExecutorService(); case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR: if (resolve) + { return getNegotiator(); + } return basicGetNegotiator(); case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER: return getClientProtocolProvider(); @@ -525,14 +551,20 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (userID: "); if (userIDESet) + { result.append(userID); + } else + { result.append(""); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java index a582a1a2f2..3ca16a373b 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java @@ -94,7 +94,9 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec String oldUrl = url; url = newUrl; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url)); + } } /** @@ -172,7 +174,9 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (url: "); diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java index fdd1713244..00bb893c06 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java @@ -85,7 +85,9 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name)); + } } /** @@ -163,7 +165,9 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java index b3349c2d17..2ea3f260ad 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java @@ -95,7 +95,9 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name)); + } } /** @@ -173,7 +175,9 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java index 8a58858e9b..0e3892bcbb 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java @@ -172,7 +172,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka public static Net4jDefsPackage init() { if (isInited) + { return (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI); + } // Obtain or create and register package Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE @@ -534,7 +536,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -599,7 +603,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -617,17 +623,17 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka // Add supertypes to classes connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - clientProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef()); - tcpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef()); + clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef()); + tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef()); acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - tcpAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef()); - jvmAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef()); - jvmConnectorDefEClass.getESuperTypes().add(this.getConnectorDef()); - httpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef()); + tcpAcceptorDefEClass.getESuperTypes().add(getAcceptorDef()); + jvmAcceptorDefEClass.getESuperTypes().add(getAcceptorDef()); + jvmConnectorDefEClass.getESuperTypes().add(getConnectorDef()); + httpConnectorDefEClass.getESuperTypes().add(getConnectorDef()); tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - serverProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef()); + serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef()); bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - bufferPoolDefEClass.getESuperTypes().add(this.getBufferProviderDef()); + bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef()); protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters @@ -635,7 +641,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka IS_GENERATED_INSTANCE_CLASS); initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getConnectorDef_BufferProvider(), this.getBufferProviderDef(), null, "bufferProvider", null, 1, 1, + initEReference(getConnectorDef_BufferProvider(), getBufferProviderDef(), null, "bufferProvider", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null, @@ -644,7 +650,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, 0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getConnectorDef_ClientProtocolProvider(), this.getClientProtocolFactoryDef(), null, + initEReference(getConnectorDef_ClientProtocolProvider(), getClientProtocolFactoryDef(), null, "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -653,7 +659,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTCPConnectorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1, + initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1, TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class, @@ -663,7 +669,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getAcceptorDef_BufferProvider(), this.getBufferPoolDef(), null, "bufferProvider", null, 0, 1, + initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null, @@ -672,7 +678,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getAcceptorDef_ServerProtocolProvider(), this.getServerProtocolFactoryDef(), null, + initEReference(getAcceptorDef_ServerProtocolProvider(), getServerProtocolFactoryDef(), null, "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -682,7 +688,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1, + initEReference(getTCPAcceptorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1, TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java index c79220e3f1..13ff49f79b 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java @@ -129,7 +129,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe String oldHost = host; host = newHost; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host)); + } } /** @@ -152,7 +154,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe int oldPort = port; port = newPort; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port)); + } } /** @@ -169,8 +173,10 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe if (tcpSelectorDef != oldTcpSelectorDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef)); + } } } return tcpSelectorDef; @@ -196,8 +202,10 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef; tcpSelectorDef = newTcpSelectorDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef)); + } } /** @@ -216,7 +224,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe return getPort(); case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF: if (resolve) + { return getTcpSelectorDef(); + } return basicGetTcpSelectorDef(); } return super.eGet(featureID, resolve, coreType); @@ -297,7 +307,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (host: "); diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java index f043ae48f9..95f975dd40 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java @@ -131,8 +131,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto if (tcpSelectorDef != oldTcpSelectorDef) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef)); + } } } return tcpSelectorDef; @@ -158,8 +160,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef; tcpSelectorDef = newTcpSelectorDef; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef)); + } } /** @@ -182,7 +186,9 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto String oldHost = host; host = newHost; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host)); + } } /** @@ -223,8 +229,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto boolean oldPortESet = portESet; portESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port, !oldPortESet)); + } } /** @@ -239,8 +247,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto port = PORT_EDEFAULT; portESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, PORT_EDEFAULT, oldPortESet)); + } } /** @@ -265,7 +275,9 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto { case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF: if (resolve) + { return getTcpSelectorDef(); + } return basicGetTcpSelectorDef(); case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST: return getHost(); @@ -350,16 +362,22 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (host: "); result.append(host); result.append(", port: "); if (portESet) + { result.append(port); + } else + { result.append(""); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java index 962b262e65..cd8c5ea994 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java @@ -111,9 +111,13 @@ public class Net4jDefsSwitch ConnectorDef connectorDef = (ConnectorDef)theEObject; T result = caseConnectorDef(connectorDef); if (result == null) + { result = caseDef(connectorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF: @@ -121,11 +125,17 @@ public class Net4jDefsSwitch ClientProtocolFactoryDef clientProtocolFactoryDef = (ClientProtocolFactoryDef)theEObject; T result = caseClientProtocolFactoryDef(clientProtocolFactoryDef); if (result == null) + { result = caseProtocolProviderDef(clientProtocolFactoryDef); + } if (result == null) + { result = caseDef(clientProtocolFactoryDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.TCP_CONNECTOR_DEF: @@ -133,11 +143,17 @@ public class Net4jDefsSwitch TCPConnectorDef tcpConnectorDef = (TCPConnectorDef)theEObject; T result = caseTCPConnectorDef(tcpConnectorDef); if (result == null) + { result = caseConnectorDef(tcpConnectorDef); + } if (result == null) + { result = caseDef(tcpConnectorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.ACCEPTOR_DEF: @@ -145,9 +161,13 @@ public class Net4jDefsSwitch AcceptorDef acceptorDef = (AcceptorDef)theEObject; T result = caseAcceptorDef(acceptorDef); if (result == null) + { result = caseDef(acceptorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.TCP_ACCEPTOR_DEF: @@ -155,11 +175,17 @@ public class Net4jDefsSwitch TCPAcceptorDef tcpAcceptorDef = (TCPAcceptorDef)theEObject; T result = caseTCPAcceptorDef(tcpAcceptorDef); if (result == null) + { result = caseAcceptorDef(tcpAcceptorDef); + } if (result == null) + { result = caseDef(tcpAcceptorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.JVM_ACCEPTOR_DEF: @@ -167,11 +193,17 @@ public class Net4jDefsSwitch JVMAcceptorDef jvmAcceptorDef = (JVMAcceptorDef)theEObject; T result = caseJVMAcceptorDef(jvmAcceptorDef); if (result == null) + { result = caseAcceptorDef(jvmAcceptorDef); + } if (result == null) + { result = caseDef(jvmAcceptorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.JVM_CONNECTOR_DEF: @@ -179,11 +211,17 @@ public class Net4jDefsSwitch JVMConnectorDef jvmConnectorDef = (JVMConnectorDef)theEObject; T result = caseJVMConnectorDef(jvmConnectorDef); if (result == null) + { result = caseConnectorDef(jvmConnectorDef); + } if (result == null) + { result = caseDef(jvmConnectorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.HTTP_CONNECTOR_DEF: @@ -191,11 +229,17 @@ public class Net4jDefsSwitch HTTPConnectorDef httpConnectorDef = (HTTPConnectorDef)theEObject; T result = caseHTTPConnectorDef(httpConnectorDef); if (result == null) + { result = caseConnectorDef(httpConnectorDef); + } if (result == null) + { result = caseDef(httpConnectorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.TCP_SELECTOR_DEF: @@ -203,9 +247,13 @@ public class Net4jDefsSwitch TCPSelectorDef tcpSelectorDef = (TCPSelectorDef)theEObject; T result = caseTCPSelectorDef(tcpSelectorDef); if (result == null) + { result = caseDef(tcpSelectorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.SERVER_PROTOCOL_FACTORY_DEF: @@ -213,11 +261,17 @@ public class Net4jDefsSwitch ServerProtocolFactoryDef serverProtocolFactoryDef = (ServerProtocolFactoryDef)theEObject; T result = caseServerProtocolFactoryDef(serverProtocolFactoryDef); if (result == null) + { result = caseProtocolProviderDef(serverProtocolFactoryDef); + } if (result == null) + { result = caseDef(serverProtocolFactoryDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.BUFFER_PROVIDER_DEF: @@ -225,9 +279,13 @@ public class Net4jDefsSwitch BufferProviderDef bufferProviderDef = (BufferProviderDef)theEObject; T result = caseBufferProviderDef(bufferProviderDef); if (result == null) + { result = caseDef(bufferProviderDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.BUFFER_POOL_DEF: @@ -235,11 +293,17 @@ public class Net4jDefsSwitch BufferPoolDef bufferPoolDef = (BufferPoolDef)theEObject; T result = caseBufferPoolDef(bufferPoolDef); if (result == null) + { result = caseBufferProviderDef(bufferPoolDef); + } if (result == null) + { result = caseDef(bufferPoolDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jDefsPackage.PROTOCOL_PROVIDER_DEF: @@ -247,9 +311,13 @@ public class Net4jDefsSwitch ProtocolProviderDef protocolProviderDef = (ProtocolProviderDef)theEObject; T result = caseProtocolProviderDef(protocolProviderDef); if (result == null) + { result = caseDef(protocolProviderDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.net4j.tests/.classpath b/plugins/org.eclipse.net4j.tests/.classpath index aa30c2ea48..64c5e31b7a 100644 --- a/plugins/org.eclipse.net4j.tests/.classpath +++ b/plugins/org.eclipse.net4j.tests/.classpath @@ -1,27 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - + diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java index 3cdf443921..6224170ad1 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java @@ -123,8 +123,10 @@ public class TestDefImpl extends DefImpl implements TestDef String oldAttribute = attribute; attribute = newAttribute; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, TestDefsPackage.TEST_DEF__ATTRIBUTE, oldAttribute, attribute)); + } } /** @@ -214,7 +216,9 @@ public class TestDefImpl extends DefImpl implements TestDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (attribute: "); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java index c62254eb92..c3092d1187 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java @@ -76,7 +76,9 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage public static TestDefsPackage init() { if (isInited) + { return (TestDefsPackage)EPackage.Registry.INSTANCE.getEPackage(TestDefsPackage.eNS_URI); + } // Obtain or create and register package TestDefsPackageImpl theTestDefsPackage = (TestDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestDefsPackageImpl ? EPackage.Registry.INSTANCE @@ -158,7 +160,9 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -183,7 +187,9 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java index c0c69d59a7..3ac161018d 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java @@ -99,9 +99,13 @@ public class TestDefsSwitch TestDef testDef = (TestDef)theEObject; T result = caseTestDef(testDef); if (result == null) + { result = caseDef(testDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java index 9a3ca98a12..7830e79554 100644 --- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java @@ -74,7 +74,9 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP public static Net4JUIDefsPackage init() { if (isInited) + { return (Net4JUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4JUIDefsPackage.eNS_URI); + } // Obtain or create and register package Net4JUIDefsPackageImpl theNet4JUIDefsPackage = (Net4JUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Net4JUIDefsPackageImpl ? EPackage.Registry.INSTANCE @@ -136,7 +138,9 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -159,7 +163,9 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java index 9598283213..30cf9de782 100644 --- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java +++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsSwitch.java @@ -99,9 +99,13 @@ public class Net4JUIDefsSwitch InteractiveCredentialsProviderDef interactiveCredentialsProviderDef = (InteractiveCredentialsProviderDef)theEObject; T result = caseInteractiveCredentialsProviderDef(interactiveCredentialsProviderDef); if (result == null) + { result = caseDef(interactiveCredentialsProviderDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java index 8d5baef015..ed044ea886 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java @@ -96,8 +96,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha if (userManager != oldUserManager) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager)); + } } } return userManager; @@ -123,8 +125,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha UserManagerDef oldUserManager = userManager; userManager = newUserManager; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager)); + } } /** @@ -141,8 +145,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha if (randomizer != oldRandomizer) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER, oldRandomizer, randomizer)); + } } } return randomizer; @@ -168,8 +174,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha RandomizerDef oldRandomizer = randomizer; randomizer = newRandomizer; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER, oldRandomizer, randomizer)); + } } /** @@ -184,11 +192,15 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha { case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER: if (resolve) + { return getUserManager(); + } return basicGetUserManager(); case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER: if (resolve) + { return getRandomizer(); + } return basicGetRandomizer(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java index 3a89f0df4a..3c6a79b507 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java @@ -93,8 +93,10 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred String oldUserID = userID; userID = newUserID; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID, oldUserID, userID)); + } } /** @@ -172,7 +174,9 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (userID: "); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java index be05186418..cfae57d862 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java @@ -110,8 +110,10 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer if (defaultDefinition != oldDefaultDefinition) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition)); + } } } return defaultDefinition; @@ -137,8 +139,10 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer Def oldDefaultDefinition = defaultDefinition; defaultDefinition = newDefaultDefinition; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition)); + } } /** @@ -171,7 +175,9 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer return getDefinitions(); case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION: if (resolve) + { return getDefaultDefinition(); + } return basicGetDefaultDefinition(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java index 4cd7699dac..b2871823fc 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java @@ -163,7 +163,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD public static Net4jUtilDefsPackage init() { if (isInited) + { return (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI); + } // Obtain or create and register package Net4jUtilDefsPackageImpl theNet4jUtilDefsPackage = (Net4jUtilDefsPackageImpl)(EPackage.Registry.INSTANCE @@ -462,7 +464,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -520,7 +524,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -533,23 +539,23 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD // Set bounds for type parameters // Add supertypes to classes - executorServiceDefEClass.getESuperTypes().add(this.getDef()); - threadPoolDefEClass.getESuperTypes().add(this.getExecutorServiceDef()); - randomizerDefEClass.getESuperTypes().add(this.getDef()); - userManagerDefEClass.getESuperTypes().add(this.getDef()); - passwordCredentialsProviderDefEClass.getESuperTypes().add(this.getCredentialsProviderDef()); - credentialsProviderDefEClass.getESuperTypes().add(this.getDef()); - negotiatorDefEClass.getESuperTypes().add(this.getDef()); - responseNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef()); - challengeNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef()); + executorServiceDefEClass.getESuperTypes().add(getDef()); + threadPoolDefEClass.getESuperTypes().add(getExecutorServiceDef()); + randomizerDefEClass.getESuperTypes().add(getDef()); + userManagerDefEClass.getESuperTypes().add(getDef()); + passwordCredentialsProviderDefEClass.getESuperTypes().add(getCredentialsProviderDef()); + credentialsProviderDefEClass.getESuperTypes().add(getDef()); + negotiatorDefEClass.getESuperTypes().add(getDef()); + responseNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef()); + challengeNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef()); // Initialize classes and features; add operations and parameters initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getDefContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefContainer.class, + initEReference(getDefContainer_Definitions(), getDef(), null, "definitions", null, 1, -1, DefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDefContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1, + initEReference(getDefContainer_DefaultDefinition(), getDef(), null, "defaultDefinition", null, 0, 1, DefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -578,9 +584,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getUserManagerDef_User(), getUser(), null, "user", null, 1, -1, UserManagerDef.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT, @@ -605,16 +611,16 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.getCredentialsProviderDef(), null, + initEReference(getResponseNegotiatorDef_CredentialsProvider(), getCredentialsProviderDef(), null, "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1, + initEReference(getChallengeNegotiatorDef_UserManager(), getUserManagerDef(), null, "userManager", null, 0, 1, ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1, + initEReference(getChallengeNegotiatorDef_Randomizer(), getRandomizerDef(), null, "randomizer", null, 0, 1, ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java index d2ca8c0c99..fce17bc1cb 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java @@ -99,8 +99,10 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm String oldPassword = password; password = newPassword; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD, oldPassword, password)); + } } /** @@ -178,7 +180,9 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (password: "); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java index 9f7ced68ae..de91115ff4 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java @@ -179,8 +179,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef boolean oldAlgorithmNameESet = algorithmNameESet; algorithmNameESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME, oldAlgorithmName, algorithmName, !oldAlgorithmNameESet)); + } } /** @@ -195,8 +197,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef algorithmName = ALGORITHM_NAME_EDEFAULT; algorithmNameESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME, oldAlgorithmName, ALGORITHM_NAME_EDEFAULT, oldAlgorithmNameESet)); + } } /** @@ -231,8 +235,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef boolean oldProviderNameESet = providerNameESet; providerNameESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME, oldProviderName, providerName, !oldProviderNameESet)); + } } /** @@ -247,8 +253,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef providerName = PROVIDER_NAME_EDEFAULT; providerNameESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME, oldProviderName, PROVIDER_NAME_EDEFAULT, oldProviderNameESet)); + } } /** @@ -283,8 +291,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef boolean oldSeedESet = seedESet; seedESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed, seed, !oldSeedESet)); + } } /** @@ -299,8 +309,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef seed = SEED_EDEFAULT; seedESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed, SEED_EDEFAULT, oldSeedESet)); + } } /** @@ -408,24 +420,38 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (algorithmName: "); if (algorithmNameESet) + { result.append(algorithmName); + } else + { result.append(""); + } result.append(", providerName: "); if (providerNameESet) + { result.append(providerName); + } else + { result.append(""); + } result.append(", seed: "); if (seedESet) + { result.append(seed); + } else + { result.append(""); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java index f9b91b7c49..08eb4d469e 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java @@ -82,9 +82,11 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp if (credentialsProvider != oldCredentialsProvider) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider, credentialsProvider)); + } } } return credentialsProvider; @@ -110,9 +112,11 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp CredentialsProviderDef oldCredentialsProvider = credentialsProvider; credentialsProvider = newCredentialsProvider; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider, credentialsProvider)); + } } /** @@ -127,7 +131,9 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp { case Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER: if (resolve) + { return getCredentialsProvider(); + } return basicGetCredentialsProvider(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java index 01d8db456a..67ec248ae4 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java @@ -74,7 +74,7 @@ public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadP public DaemonThreadFactory(String threadGroupIdentifier) { super(); - this.threadGroup = new ThreadGroup(threadGroupIdentifier); + threadGroup = new ThreadGroup(threadGroupIdentifier); } public Thread newThread(Runnable r) diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java index 1f4b6f4ab7..a62fa975e5 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java @@ -114,7 +114,9 @@ public class UserImpl extends EObjectImpl implements User String oldUserID = userID; userID = newUserID; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__USER_ID, oldUserID, userID)); + } } /** @@ -137,7 +139,9 @@ public class UserImpl extends EObjectImpl implements User String oldPassword = password; password = newPassword; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__PASSWORD, oldPassword, password)); + } } /** @@ -225,7 +229,9 @@ public class UserImpl extends EObjectImpl implements User public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (userID: "); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java index 70be88be16..2d11430341 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java @@ -90,7 +90,9 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef public void unsetUser() { if (user != null) + { ((InternalEList.Unsettable)user).unset(); + } } /** diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java index 409151a29a..bbdd3f0057 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java @@ -109,7 +109,9 @@ public class Net4jUtilDefsSwitch DefContainer defContainer = (DefContainer)theEObject; T result = caseDefContainer(defContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.DEF: @@ -117,7 +119,9 @@ public class Net4jUtilDefsSwitch Def def = (Def)theEObject; T result = caseDef(def); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.EXECUTOR_SERVICE_DEF: @@ -125,9 +129,13 @@ public class Net4jUtilDefsSwitch ExecutorServiceDef executorServiceDef = (ExecutorServiceDef)theEObject; T result = caseExecutorServiceDef(executorServiceDef); if (result == null) + { result = caseDef(executorServiceDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.THREAD_POOL_DEF: @@ -135,11 +143,17 @@ public class Net4jUtilDefsSwitch ThreadPoolDef threadPoolDef = (ThreadPoolDef)theEObject; T result = caseThreadPoolDef(threadPoolDef); if (result == null) + { result = caseExecutorServiceDef(threadPoolDef); + } if (result == null) + { result = caseDef(threadPoolDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.RANDOMIZER_DEF: @@ -147,9 +161,13 @@ public class Net4jUtilDefsSwitch RandomizerDef randomizerDef = (RandomizerDef)theEObject; T result = caseRandomizerDef(randomizerDef); if (result == null) + { result = caseDef(randomizerDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.USER_MANAGER_DEF: @@ -157,9 +175,13 @@ public class Net4jUtilDefsSwitch UserManagerDef userManagerDef = (UserManagerDef)theEObject; T result = caseUserManagerDef(userManagerDef); if (result == null) + { result = caseDef(userManagerDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.USER: @@ -167,7 +189,9 @@ public class Net4jUtilDefsSwitch User user = (User)theEObject; T result = caseUser(user); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF: @@ -175,11 +199,17 @@ public class Net4jUtilDefsSwitch PasswordCredentialsProviderDef passwordCredentialsProviderDef = (PasswordCredentialsProviderDef)theEObject; T result = casePasswordCredentialsProviderDef(passwordCredentialsProviderDef); if (result == null) + { result = caseCredentialsProviderDef(passwordCredentialsProviderDef); + } if (result == null) + { result = caseDef(passwordCredentialsProviderDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.CREDENTIALS_PROVIDER_DEF: @@ -187,9 +217,13 @@ public class Net4jUtilDefsSwitch CredentialsProviderDef credentialsProviderDef = (CredentialsProviderDef)theEObject; T result = caseCredentialsProviderDef(credentialsProviderDef); if (result == null) + { result = caseDef(credentialsProviderDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.NEGOTIATOR_DEF: @@ -197,9 +231,13 @@ public class Net4jUtilDefsSwitch NegotiatorDef negotiatorDef = (NegotiatorDef)theEObject; T result = caseNegotiatorDef(negotiatorDef); if (result == null) + { result = caseDef(negotiatorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF: @@ -207,11 +245,17 @@ public class Net4jUtilDefsSwitch ResponseNegotiatorDef responseNegotiatorDef = (ResponseNegotiatorDef)theEObject; T result = caseResponseNegotiatorDef(responseNegotiatorDef); if (result == null) + { result = caseNegotiatorDef(responseNegotiatorDef); + } if (result == null) + { result = caseDef(responseNegotiatorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF: @@ -219,11 +263,17 @@ public class Net4jUtilDefsSwitch ChallengeNegotiatorDef challengeNegotiatorDef = (ChallengeNegotiatorDef)theEObject; T result = caseChallengeNegotiatorDef(challengeNegotiatorDef); if (result == null) + { result = caseNegotiatorDef(challengeNegotiatorDef); + } if (result == null) + { result = caseDef(challengeNegotiatorDef); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java index 5341761492..7465a63ae0 100644 --- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java +++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java @@ -234,7 +234,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) + if (!(type instanceof Class) || ((Class)type).isInstance(adapter)) { return adapter; } @@ -287,13 +287,21 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i public void dispose() { if (businessDayItemProvider != null) + { businessDayItemProvider.dispose(); + } if (orderItemProvider != null) + { orderItemProvider.dispose(); + } if (orderDetailItemProvider != null) + { orderDetailItemProvider.dispose(); + } if (waiterItemProvider != null) + { waiterItemProvider.dispose(); + } } } diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java index fa975e650e..27fa3a98a2 100644 --- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java +++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java @@ -79,13 +79,13 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory switch (eClass.getClassifierID()) { case BusinessPackage.BUSINESS_DAY: - return (EObject)createBusinessDay(); + return createBusinessDay(); case BusinessPackage.ORDER: - return (EObject)createOrder(); + return createOrder(); case BusinessPackage.ORDER_DETAIL: - return (EObject)createOrderDetail(); + return createOrderDetail(); case BusinessPackage.WAITER: - return (EObject)createWaiter(); + return createWaiter(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -178,8 +178,10 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory { OrderState result = OrderState.get(initialValue); if (result == null) + { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + } return result; } diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java index bbe414c8e9..e8e95d975d 100644 --- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java +++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java @@ -111,7 +111,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage public static BusinessPackage init() { if (isInited) + { return (BusinessPackage)EPackage.Registry.INSTANCE.getEPackage(BusinessPackage.eNS_URI); + } // Obtain or create and register package BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE @@ -403,7 +405,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -454,7 +458,9 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -480,47 +486,47 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getBusinessDay_Orders(), this.getOrder(), this.getOrder_BusinessDay(), "orders", null, 0, -1, + initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getBusinessDay_Waiters(), this.getWaiter(), this.getWaiter_BusinessDay(), "waiters", null, 1, -1, + initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrder_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Orders(), "businessDay", null, 1, - 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1, + Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, - 1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1, + Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1, - OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getOrderDetail_State(), this.getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, + initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getWaiter_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Waiters(), "businessDay", null, - 0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1, + Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java index 2ee1463e52..8b97b53448 100644 --- a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java +++ b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessSwitch.java @@ -103,7 +103,9 @@ public class BusinessSwitch BusinessDay businessDay = (BusinessDay)theEObject; T result = caseBusinessDay(businessDay); if (result == null) + { result = defaultCase(theEObject); + } return result; } case BusinessPackage.ORDER: @@ -111,7 +113,9 @@ public class BusinessSwitch Order order = (Order)theEObject; T result = caseOrder(order); if (result == null) + { result = defaultCase(theEObject); + } return result; } case BusinessPackage.ORDER_DETAIL: @@ -119,7 +123,9 @@ public class BusinessSwitch OrderDetail orderDetail = (OrderDetail)theEObject; T result = caseOrderDetail(orderDetail); if (result == null) + { result = defaultCase(theEObject); + } return result; } case BusinessPackage.WAITER: @@ -127,7 +133,9 @@ public class BusinessSwitch Waiter waiter = (Waiter)theEObject; T result = caseWaiter(waiter); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java index 0dbbf4565a..a27601a724 100644 --- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java +++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java @@ -404,7 +404,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) + if (!(type instanceof Class) || ((Class)type).isInstance(adapter)) { return adapter; } @@ -457,27 +457,49 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory public void dispose() { if (stockItemProvider != null) + { stockItemProvider.dispose(); + } if (stockProductItemProvider != null) + { stockProductItemProvider.dispose(); + } if (recipeItemProvider != null) + { recipeItemProvider.dispose(); + } if (ingredientItemProvider != null) + { ingredientItemProvider.dispose(); + } if (menuCardItemProvider != null) + { menuCardItemProvider.dispose(); + } if (restaurantItemProvider != null) + { restaurantItemProvider.dispose(); + } if (departmentItemProvider != null) + { departmentItemProvider.dispose(); + } if (offeringItemProvider != null) + { offeringItemProvider.dispose(); + } if (tableItemProvider != null) + { tableItemProvider.dispose(); + } if (employeeItemProvider != null) + { employeeItemProvider.dispose(); + } if (sectionItemProvider != null) + { sectionItemProvider.dispose(); + } } } diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java index a1a4c305c1..bd8649d681 100644 --- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java +++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java @@ -84,27 +84,27 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto switch (eClass.getClassifierID()) { case InventoryPackage.STOCK: - return (EObject)createStock(); + return createStock(); case InventoryPackage.STOCK_PRODUCT: - return (EObject)createStockProduct(); + return createStockProduct(); case InventoryPackage.RECIPE: - return (EObject)createRecipe(); + return createRecipe(); case InventoryPackage.INGREDIENT: - return (EObject)createIngredient(); + return createIngredient(); case InventoryPackage.MENU_CARD: - return (EObject)createMenuCard(); + return createMenuCard(); case InventoryPackage.RESTAURANT: - return (EObject)createRestaurant(); + return createRestaurant(); case InventoryPackage.DEPARTMENT: - return (EObject)createDepartment(); + return createDepartment(); case InventoryPackage.OFFERING: - return (EObject)createOffering(); + return createOffering(); case InventoryPackage.TABLE: - return (EObject)createTable(); + return createTable(); case InventoryPackage.EMPLOYEE: - return (EObject)createEmployee(); + return createEmployee(); case InventoryPackage.SECTION: - return (EObject)createSection(); + return createSection(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java index 91880a1fe9..0d99719826 100644 --- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java +++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java @@ -173,7 +173,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka public static InventoryPackage init() { if (isInited) + { return (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI); + } // Obtain or create and register package InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE @@ -752,7 +754,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -839,7 +843,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -852,19 +858,19 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka // Set bounds for type parameters // Add supertypes to classes - stockProductEClass.getESuperTypes().add(this.getProduct()); - recipeEClass.getESuperTypes().add(this.getProduct()); - departmentEClass.getESuperTypes().add(this.getStation()); - tableEClass.getESuperTypes().add(this.getStation()); + stockProductEClass.getESuperTypes().add(getProduct()); + recipeEClass.getESuperTypes().add(getProduct()); + departmentEClass.getESuperTypes().add(getStation()); + tableEClass.getESuperTypes().add(getStation()); // Initialize classes and features; add operations and parameters initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getStock_Products(), this.getStockProduct(), this.getStockProduct_Stock(), "products", null, 0, -1, + initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getStock_Department(), this.getDepartment(), this.getDepartment_Stocks(), "department", null, 1, 1, + initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1, Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -876,9 +882,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getStockProduct_Stock(), this.getStock(), this.getStock_Products(), "stock", null, 1, 1, - StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class, @@ -887,33 +893,33 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRecipe_Ingredients(), this.getIngredient(), this.getIngredient_Recipe(), "ingredients", null, 0, - -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRecipe_Department(), this.getDepartment(), this.getDepartment_Recipes(), "department", null, 0, - 1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1, + Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1, + Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIngredient_Recipe(), this.getRecipe(), this.getRecipe_Ingredients(), "recipe", null, 1, 1, + initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getIngredient_Product(), this.getProduct(), null, "product", null, 1, 1, Ingredient.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMenuCard_Restaurant(), this.getRestaurant(), this.getRestaurant_MenuCards(), "restaurant", null, - 1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMenuCard_Sections(), this.getSection(), this.getSection_MenuCard(), "sections", null, 1, -1, + initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1, + MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -921,59 +927,59 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka IS_GENERATED_INSTANCE_CLASS); initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRestaurant_Departments(), this.getDepartment(), this.getDepartment_Restaurant(), "departments", - null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRestaurant_MenuCards(), this.getMenuCard(), this.getMenuCard_Restaurant(), "menuCards", null, 0, + initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRestaurant_Tables(), this.getTable(), this.getTable_Restaurant(), "tables", null, 0, -1, + initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRestaurant_Stations(), this.getStation(), null, "stations", null, 0, -1, Restaurant.class, + initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getDepartment_Recipes(), this.getRecipe(), this.getRecipe_Department(), "recipes", null, 0, -1, + initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDepartment_Restaurant(), this.getRestaurant(), this.getRestaurant_Departments(), "restaurant", - null, 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDepartment_Employees(), this.getEmployee(), this.getEmployee_Department(), "employees", null, 0, - -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1, + Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDepartment_Stocks(), this.getStock(), this.getStock_Department(), "stocks", null, 1, -1, + initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOffering_Product(), this.getProduct(), null, "product", null, 1, 1, Offering.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOffering_Section(), this.getSection(), this.getSection_Offerings(), "section", null, 1, 1, - Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTable_Restaurant(), this.getRestaurant(), this.getRestaurant_Tables(), "restaurant", null, 1, 1, + initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getEmployee_Department(), this.getDepartment(), this.getDepartment_Employees(), "department", null, - 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1, + Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -982,10 +988,10 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSection_MenuCard(), this.getMenuCard(), this.getMenuCard_Sections(), "menuCard", null, 1, 1, - Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSection_Offerings(), this.getOffering(), this.getOffering_Section(), "offerings", null, 1, -1, + initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1, Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT, diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java index 441218a6a0..28537b298d 100644 --- a/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java +++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/util/InventorySwitch.java @@ -112,7 +112,9 @@ public class InventorySwitch Stock stock = (Stock)theEObject; T result = caseStock(stock); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.PRODUCT: @@ -120,7 +122,9 @@ public class InventorySwitch Product product = (Product)theEObject; T result = caseProduct(product); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.STOCK_PRODUCT: @@ -128,9 +132,13 @@ public class InventorySwitch StockProduct stockProduct = (StockProduct)theEObject; T result = caseStockProduct(stockProduct); if (result == null) + { result = caseProduct(stockProduct); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.RECIPE: @@ -138,9 +146,13 @@ public class InventorySwitch Recipe recipe = (Recipe)theEObject; T result = caseRecipe(recipe); if (result == null) + { result = caseProduct(recipe); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.INGREDIENT: @@ -148,7 +160,9 @@ public class InventorySwitch Ingredient ingredient = (Ingredient)theEObject; T result = caseIngredient(ingredient); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.MENU_CARD: @@ -156,7 +170,9 @@ public class InventorySwitch MenuCard menuCard = (MenuCard)theEObject; T result = caseMenuCard(menuCard); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.RESTAURANT: @@ -164,7 +180,9 @@ public class InventorySwitch Restaurant restaurant = (Restaurant)theEObject; T result = caseRestaurant(restaurant); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.DEPARTMENT: @@ -172,9 +190,13 @@ public class InventorySwitch Department department = (Department)theEObject; T result = caseDepartment(department); if (result == null) + { result = caseStation(department); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.OFFERING: @@ -182,7 +204,9 @@ public class InventorySwitch Offering offering = (Offering)theEObject; T result = caseOffering(offering); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.TABLE: @@ -190,9 +214,13 @@ public class InventorySwitch Table table = (Table)theEObject; T result = caseTable(table); if (result == null) + { result = caseStation(table); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.EMPLOYEE: @@ -200,7 +228,9 @@ public class InventorySwitch Employee employee = (Employee)theEObject; T result = caseEmployee(employee); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.STATION: @@ -208,7 +238,9 @@ public class InventorySwitch Station station = (Station)theEObject; T result = caseStation(station); if (result == null) + { result = defaultCase(theEObject); + } return result; } case InventoryPackage.SECTION: @@ -216,7 +248,9 @@ public class InventorySwitch Section section = (Section)theEObject; T result = caseSection(section); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java index 04378dc3d6..d0ce32711f 100644 --- a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java +++ b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Application.java @@ -57,14 +57,18 @@ public class Application implements IApplication { final IWorkbench workbench = PlatformUI.getWorkbench(); if (workbench == null) + { return; + } final Display display = workbench.getDisplay(); display.syncExec(new Runnable() { public void run() { if (!display.isDisposed()) + { workbench.close(); + } } }); } diff --git a/plugins/org.gastro.server.web/src-gen/templates/MenuCardTemplate.java b/plugins/org.gastro.server.web/src-gen/templates/MenuCardTemplate.java index 1c16836d9f..b8d9796cb4 100644 --- a/plugins/org.gastro.server.web/src-gen/templates/MenuCardTemplate.java +++ b/plugins/org.gastro.server.web/src-gen/templates/MenuCardTemplate.java @@ -17,7 +17,7 @@ public class MenuCardTemplate return result; } - public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; + public final String NL = nl == null ? System.getProperties().getProperty("line.separator") : nl; protected final String TEXT_1 = "\t"; -- cgit v1.2.3