diff options
| author | Martin Fluegge | 2011-02-22 21:38:54 +0000 |
|---|---|---|
| committer | Martin Fluegge | 2011-02-22 21:38:54 +0000 |
| commit | 8a4ddd6e9ad7206180607c0a3f18e9ca2fc0bbdb (patch) | |
| tree | 8fbc1120433884a2a3beafd71afd57c19a440b6d /plugins/org.eclipse.emf.cdo.tests.model4 | |
| parent | 969a029246a075fc27744d14298a6577935b5d72 (diff) | |
| download | cdo-8a4ddd6e9ad7206180607c0a3f18e9ca2fc0bbdb.tar.gz cdo-8a4ddd6e9ad7206180607c0a3f18e9ca2fc0bbdb.tar.xz cdo-8a4ddd6e9ad7206180607c0a3f18e9ca2fc0bbdb.zip | |
[335669] Remove LITERALS constant from CDO test models
https://bugs.eclipse.org/bugs/show_bug.cgi?id=335669
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model4')
78 files changed, 463 insertions, 2139 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel index 06b284f3ac..6af534ae6b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel @@ -11,7 +11,7 @@ <foreignModel>model4.ecore</foreignModel> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables> <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true" - ecorePackage="model4.ecore#/"> + literalsInterface="false" ecorePackage="model4.ecore#/"> <genClasses ecoreClass="model4.ecore#//RefSingleContained"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefSingleContained/element"/> </genClasses> @@ -40,6 +40,13 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//MultiNonContainedElement/name"/> <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4.ecore#//MultiNonContainedElement/parent"/> </genClasses> + <genClasses ecoreClass="model4.ecore#//RefMultiNonContainedUnsettable"> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//RefMultiNonContainedUnsettable/elements"/> + </genClasses> + <genClasses ecoreClass="model4.ecore#//MultiNonContainedUnsettableElement"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//MultiNonContainedUnsettableElement/name"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//MultiNonContainedUnsettableElement/parent"/> + </genClasses> <genClasses ecoreClass="model4.ecore#//RefSingleContainedNPL"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefSingleContainedNPL/element"/> </genClasses> diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel index 6ba575a717..3d08fac773 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel @@ -1,101 +1,210 @@ <?xml version="1.0" encoding="UTF-8"?> -<genmodel:GenModel xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 Eike Stepper - initial API and implementation" - modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory="" editorDirectory="" - modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false" - codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" - complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit" - usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel#//model4interfaces"> +<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit"> <foreignModel>model4.ecore</foreignModel> <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables> - <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" - ecorePackage="model4.ecore#/"> - <genClasses ecoreClass="model4.ecore#//RefSingleContained"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefSingleContained/element"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//SingleContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//SingleContainedElement/name"/> - <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4.ecore#//SingleContainedElement/parent"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefSingleNonContained"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//RefSingleNonContained/element"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//SingleNonContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//SingleNonContainedElement/name"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//SingleNonContainedElement/parent"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefMultiContained"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefMultiContained/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//MultiContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//MultiContainedElement/name"/> - <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4.ecore#//MultiContainedElement/parent"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefMultiNonContained"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefMultiNonContained/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//MultiNonContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//MultiNonContainedElement/name"/> - <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model4.ecore#//MultiNonContainedElement/parent"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefSingleContainedNPL"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefSingleContainedNPL/element"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefSingleNonContainedNPL"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//RefSingleNonContainedNPL/element"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefMultiContainedNPL"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//RefMultiContainedNPL/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//RefMultiNonContainedNPL"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//RefMultiNonContainedNPL/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//ContainedElementNoOpposite"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//ContainedElementNoOpposite/name"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//GenRefSingleContained"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//GenRefSingleContained/element"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//GenRefSingleNonContained"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//GenRefSingleNonContained/element"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//GenRefMultiContained"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//GenRefMultiContained/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//GenRefMultiNonContained"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//GenRefMultiNonContained/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//ImplSingleRefContainer"/> - <genClasses ecoreClass="model4.ecore#//ImplSingleRefContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//ImplSingleRefContainedElement/name"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//ImplSingleRefNonContainer"/> - <genClasses ecoreClass="model4.ecore#//ImplSingleRefNonContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//ImplSingleRefNonContainedElement/name"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//ImplMultiRefNonContainer"/> - <genClasses ecoreClass="model4.ecore#//ImplMultiRefNonContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//ImplMultiRefNonContainedElement/name"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//ImplMultiRefContainer"/> - <genClasses ecoreClass="model4.ecore#//ImplMultiRefContainedElement"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//ImplMultiRefContainedElement/name"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//ImplSingleRefContainerNPL"/> - <genClasses ecoreClass="model4.ecore#//ImplSingleRefNonContainerNPL"/> - <genClasses ecoreClass="model4.ecore#//ImplMultiRefContainerNPL"/> - <genClasses ecoreClass="model4.ecore#//ImplMultiRefNonContainerNPL"/> - <genClasses ecoreClass="model4.ecore#//ImplContainedElementNPL"/> - <genClasses ecoreClass="model4.ecore#//GenRefMultiNUNonContained"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//GenRefMultiNUNonContained/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//GenRefMapNonContained"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model4.ecore#//GenRefMapNonContained/elements"/> - </genClasses> - <genClasses ecoreClass="model4.ecore#//StringToEObject"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model4.ecore#//StringToEObject/key"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model4.ecore#//StringToEObject/value"/> + <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false"> + <ecorePackage href="model4.ecore#/"/> + <genClasses> + <ecoreClass href="model4.ecore#//RefSingleContained"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefSingleContained/element"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//SingleContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//SingleContainedElement/name"/> + </genFeatures> + <genFeatures property="None" notify="false" createChild="false"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//SingleContainedElement/parent"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefSingleNonContained"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefSingleNonContained/element"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//SingleNonContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//SingleNonContainedElement/name"/> + </genFeatures> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//SingleNonContainedElement/parent"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefMultiContained"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefMultiContained/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//MultiContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//MultiContainedElement/name"/> + </genFeatures> + <genFeatures property="None" notify="false" createChild="false"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//MultiContainedElement/parent"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefMultiNonContained"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefMultiNonContained/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//MultiNonContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//MultiNonContainedElement/name"/> + </genFeatures> + <genFeatures property="None" notify="false" createChild="false"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//MultiNonContainedElement/parent"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefMultiNonContainedUnsettable"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefMultiNonContainedUnsettable/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//MultiNonContainedUnsettableElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//MultiNonContainedUnsettableElement/name"/> + </genFeatures> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//MultiNonContainedUnsettableElement/parent"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefSingleContainedNPL"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefSingleContainedNPL/element"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefSingleNonContainedNPL"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefSingleNonContainedNPL/element"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefMultiContainedNPL"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefMultiContainedNPL/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//RefMultiNonContainedNPL"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//RefMultiNonContainedNPL/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ContainedElementNoOpposite"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//ContainedElementNoOpposite/name"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//GenRefSingleContained"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//GenRefSingleContained/element"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//GenRefSingleNonContained"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//GenRefSingleNonContained/element"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//GenRefMultiContained"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//GenRefMultiContained/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//GenRefMultiNonContained"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//GenRefMultiNonContained/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplSingleRefContainer"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplSingleRefContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//ImplSingleRefContainedElement/name"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplSingleRefNonContainer"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplSingleRefNonContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//ImplSingleRefNonContainedElement/name"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplMultiRefNonContainer"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplMultiRefNonContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//ImplMultiRefNonContainedElement/name"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplMultiRefContainer"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplMultiRefContainedElement"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//ImplMultiRefContainedElement/name"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplSingleRefContainerNPL"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplSingleRefNonContainerNPL"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplMultiRefContainerNPL"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplMultiRefNonContainerNPL"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//ImplContainedElementNPL"/> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//GenRefMultiNUNonContained"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//GenRefMultiNUNonContained/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//GenRefMapNonContained"/> + <genFeatures property="None" children="true" createChild="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//GenRefMapNonContained/elements"/> + </genFeatures> + </genClasses> + <genClasses> + <ecoreClass href="model4.ecore#//StringToEObject"/> + <genFeatures createChild="false"> + <ecoreFeature xsi:type="ecore:EAttribute" href="model4.ecore#//StringToEObject/key"/> + </genFeatures> + <genFeatures notify="false" createChild="false" propertySortChoices="true"> + <ecoreFeature xsi:type="ecore:EReference" href="model4.ecore#//StringToEObject/value"/> + </genFeatures> </genClasses> </genPackages> + <usedGenPackages href="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel#//model4interfaces"/> </genmodel:GenModel> 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 ee5860b691..4a1f2717ec 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 @@ -69,7 +69,7 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta @Override protected EClass eStaticClass() { - return model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE; + return model4Package.eINSTANCE.getContainedElementNoOpposite(); } /** @@ -92,10 +92,8 @@ 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)); - } } /** @@ -173,9 +171,7 @@ 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 f469a12eb3..23d3b6baea 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 @@ -65,7 +65,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MAP_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMapNonContained(); } /** @@ -77,8 +77,8 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN { if (elements == null) { - elements = new EcoreEMap<String, EObject>(model4Package.Literals.STRING_TO_EOBJECT, StringToEObjectImpl.class, - this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS); + elements = new EcoreEMap<String, EObject>(model4Package.eINSTANCE.getStringToEObject(), + StringToEObjectImpl.class, this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS); } return elements; } @@ -111,13 +111,9 @@ 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/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java index 40ece0385e..64901d2f96 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java @@ -66,7 +66,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java index 5d8115ba4c..02c107c130 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java @@ -63,7 +63,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NU_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNUNonContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java index 683b472900..dc9da18e25 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java @@ -63,7 +63,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNonContained(); } /** 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 48c780693d..31b1b7c9dd 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 @@ -63,7 +63,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleContained(); } /** @@ -90,13 +90,9 @@ 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; } @@ -112,26 +108,18 @@ 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 09cb8d7897..ee8a932af9 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 @@ -62,7 +62,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleNonContained(); } /** @@ -79,10 +79,8 @@ 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; @@ -108,10 +106,8 @@ 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)); - } } /** @@ -126,9 +122,7 @@ 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 6d2bedac1a..b9cd5a8158 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 @@ -71,7 +71,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_CONTAINED_ELEMENT_NPL; + return model4Package.eINSTANCE.getImplContainedElementNPL(); } /** @@ -94,10 +94,8 @@ 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)); - } } /** @@ -217,9 +215,7 @@ 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 ceb6674e83..ebdfd26d63 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 @@ -75,7 +75,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefContainedElement(); } /** @@ -86,9 +86,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public IMultiRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT) - { return null; - } return (IMultiRefContainer)eContainer(); } @@ -111,33 +109,23 @@ 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)); - } } /** @@ -160,10 +148,8 @@ 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)); - } } /** @@ -178,9 +164,7 @@ 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); @@ -304,9 +288,7 @@ 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/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java index c2af2de896..c80689302e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java @@ -67,7 +67,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefContainer(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java index bdf51e1e00..156b00ecfe 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java @@ -66,7 +66,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefContainerNPL(); } /** 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 6bec464846..a2ecec3e68 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 @@ -85,7 +85,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefNonContainedElement(); } /** @@ -102,10 +102,8 @@ 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; @@ -135,13 +133,9 @@ 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; } @@ -157,26 +151,18 @@ 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)); - } } /** @@ -199,10 +185,8 @@ 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)); - } } /** @@ -217,10 +201,8 @@ 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); @@ -254,9 +236,7 @@ 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(); @@ -331,9 +311,7 @@ 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/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java index 661733dec0..c887450390 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java @@ -67,7 +67,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefNonContainer(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java index c65b10495b..46e3e5f512 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java @@ -64,7 +64,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefNonContainerNPL(); } /** 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 38b5a7be03..bcf81224d2 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 @@ -75,7 +75,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefContainedElement(); } /** @@ -86,9 +86,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public ISingleRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT) - { return null; - } return (ISingleRefContainer)eContainer(); } @@ -111,33 +109,23 @@ 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)); - } } /** @@ -160,10 +148,8 @@ 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)); - } } /** @@ -178,9 +164,7 @@ 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); @@ -304,9 +288,7 @@ 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 2f05cf0db8..275a9a3c03 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 @@ -64,7 +64,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefContainer(); } /** @@ -91,13 +91,9 @@ 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; } @@ -113,26 +109,18 @@ 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)); - } } /** @@ -147,10 +135,8 @@ 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 b6d45c7daf..5cb0afde5d 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 @@ -63,7 +63,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefContainerNPL(); } /** @@ -90,13 +90,9 @@ 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; } @@ -112,26 +108,18 @@ 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 2314655bd4..b6ce0f7860 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 @@ -85,7 +85,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefNonContainedElement(); } /** @@ -102,10 +102,8 @@ 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; @@ -135,13 +133,9 @@ 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; } @@ -157,26 +151,18 @@ 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)); - } } /** @@ -199,10 +185,8 @@ 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)); - } } /** @@ -217,10 +201,8 @@ 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); @@ -254,9 +236,7 @@ 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(); @@ -331,9 +311,7 @@ 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 34826f4f08..659965bce5 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 @@ -64,7 +64,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefNonContainer(); } /** @@ -81,10 +81,8 @@ 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; @@ -114,13 +112,9 @@ 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; } @@ -136,28 +130,20 @@ 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)); - } } /** @@ -172,11 +158,9 @@ 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); @@ -210,9 +194,7 @@ 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 4fffbb8e0a..ede7caadff 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 @@ -63,7 +63,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefNonContainerNPL(); } /** @@ -80,10 +80,8 @@ 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; @@ -109,10 +107,8 @@ 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)); - } } /** @@ -127,9 +123,7 @@ 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 38064b9c7f..4f0257f795 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 @@ -74,7 +74,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiContainedElement(); } /** @@ -97,9 +97,7 @@ 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)); - } } /** @@ -110,9 +108,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public RefMultiContained getParent() { if (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT) - { return null; - } return (RefMultiContained)eContainer(); } @@ -134,34 +130,24 @@ 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)); - } } /** @@ -176,9 +162,7 @@ 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); @@ -302,9 +286,7 @@ 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 10b2b4a205..aa0804369d 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 @@ -83,7 +83,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedElement(); } /** @@ -106,10 +106,8 @@ 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)); - } } /** @@ -126,10 +124,8 @@ 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; @@ -159,13 +155,9 @@ 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; } @@ -181,26 +173,18 @@ 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)); - } } /** @@ -215,10 +199,8 @@ 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); @@ -254,9 +236,7 @@ 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); @@ -329,9 +309,7 @@ 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 d6ab69ca64..b122de80d2 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 @@ -93,7 +93,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedUnsettableElement(); } /** @@ -116,10 +116,8 @@ 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)); - } } /** @@ -136,10 +134,8 @@ 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; @@ -171,13 +167,9 @@ 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; } @@ -193,30 +185,22 @@ 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)); - } } } @@ -236,13 +220,9 @@ 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; } @@ -261,19 +241,15 @@ 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)); - } } } @@ -299,10 +275,8 @@ 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); @@ -338,9 +312,7 @@ 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); @@ -413,9 +385,7 @@ 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/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java index dabd655045..785e93c263 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java @@ -66,7 +66,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getRefMultiContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java index 6b3c3da8f1..f44258b566 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java @@ -66,7 +66,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiContainedNPL(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java index bfd229aa1b..9aaf595431 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java @@ -66,7 +66,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getRefMultiNonContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java index 9aa317baf8..0cbc565915 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java @@ -63,7 +63,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiNonContainedNPL(); } /** 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 483de2f303..42a31e6860 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 @@ -67,7 +67,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE; + return model4Package.eINSTANCE.getRefMultiNonContainedUnsettable(); } /** @@ -94,9 +94,7 @@ 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 1eb2ca3356..398db98c2f 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 @@ -63,7 +63,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getRefSingleContained(); } /** @@ -90,13 +90,9 @@ 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; } @@ -112,26 +108,18 @@ 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)); - } } /** @@ -146,10 +134,8 @@ 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 0758c723fd..4b21900c3d 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 @@ -63,7 +63,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleContainedNPL(); } /** @@ -90,13 +90,9 @@ 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; } @@ -112,26 +108,18 @@ 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 703f5054fb..efeab9e32d 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 @@ -63,7 +63,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getRefSingleNonContained(); } /** @@ -80,10 +80,8 @@ 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; @@ -113,13 +111,9 @@ 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; } @@ -135,26 +129,18 @@ 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)); - } } /** @@ -169,10 +155,8 @@ 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); @@ -206,9 +190,7 @@ 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 c7c5eb6bcb..487fd3372a 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 @@ -62,7 +62,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleNonContainedNPL(); } /** @@ -79,10 +79,8 @@ 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; @@ -108,10 +106,8 @@ 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)); - } } /** @@ -126,9 +122,7 @@ 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 e57059b6b6..b58bac4e8c 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 @@ -74,7 +74,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleContainedElement(); } /** @@ -97,9 +97,7 @@ 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)); - } } /** @@ -110,9 +108,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public RefSingleContained getParent() { if (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT) - { return null; - } return (RefSingleContained)eContainer(); } @@ -134,34 +130,24 @@ 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)); - } } /** @@ -176,9 +162,7 @@ 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); @@ -302,9 +286,7 @@ 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 ff394c32f2..5f75085652 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 @@ -83,7 +83,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleNonContainedElement(); } /** @@ -106,10 +106,8 @@ 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)); - } } /** @@ -126,10 +124,8 @@ 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; @@ -159,13 +155,9 @@ 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; } @@ -181,26 +173,18 @@ 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)); - } } /** @@ -215,10 +199,8 @@ 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); @@ -254,9 +236,7 @@ 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); @@ -329,9 +309,7 @@ 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 420cceb552..735f674a5b 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 @@ -83,7 +83,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< @Override protected EClass eStaticClass() { - return model4Package.Literals.STRING_TO_EOBJECT; + return model4Package.eINSTANCE.getStringToEObject(); } /** @@ -106,9 +106,7 @@ 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)); - } } /** @@ -131,9 +129,7 @@ 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)); - } } /** @@ -221,9 +217,7 @@ 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: "); @@ -249,7 +243,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 7613fe4f30..0422c182de 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,9 +348,7 @@ 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 @@ -1071,9 +1069,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -1196,9 +1192,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -1236,23 +1230,25 @@ 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(), 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); + 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); 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(), 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); + 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); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), - getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), + this.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); @@ -1261,30 +1257,32 @@ 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(), getRefSingleNonContained(), - getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), + this.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(), 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); + 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); 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(), 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); + 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); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), - getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), + this.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); @@ -1293,49 +1291,50 @@ 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(), 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); + 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); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_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); + initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), + this.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); initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class, "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 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(), 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); + initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(), + this.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(), getContainedElementNoOpposite(), null, "element", null, 0, 1, - RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), this.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(), 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(), 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); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, - RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), this.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(), getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), this.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 +1426,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), this.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/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java index b18d72cdeb..4ee38aebcb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java @@ -1841,645 +1841,4 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa */ model4Factory getmodel4Factory(); - /** - * <!-- begin-user-doc --> Defines literals for the meta objects that represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl - * <em>Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContained() - * @generated - */ - EClass REF_SINGLE_CONTAINED = eINSTANCE.getRefSingleContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getRefSingleContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl - * <em>Single Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleContainedElement() - * @generated - */ - EClass SINGLE_CONTAINED_ELEMENT = eINSTANCE.getSingleContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute SINGLE_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference SINGLE_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl - * <em>Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContained() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED = eINSTANCE.getRefSingleNonContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getRefSingleNonContained_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl - * <em>Single Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleNonContainedElement() - * @generated - */ - EClass SINGLE_NON_CONTAINED_ELEMENT = eINSTANCE.getSingleNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute SINGLE_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleNonContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference SINGLE_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl - * <em>Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContained() - * @generated - */ - EClass REF_MULTI_CONTAINED = eINSTANCE.getRefMultiContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl - * <em>Multi Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiContainedElement() - * @generated - */ - EClass MULTI_CONTAINED_ELEMENT = eINSTANCE.getMultiContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute MULTI_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference MULTI_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl - * <em>Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContained() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED = eINSTANCE.getRefMultiNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiNonContained_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl - * <em>Multi Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_ELEMENT = eINSTANCE.getMultiNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference MULTI_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiNonContainedElement_Parent(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl - * <em>Ref Multi Non Contained Unsettable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedUnsettable() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_UNSETTABLE = eINSTANCE.getRefMultiNonContainedUnsettable(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS = eINSTANCE.getRefMultiNonContainedUnsettable_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl - * <em>Multi Non Contained Unsettable Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedUnsettableElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT = eINSTANCE.getMultiNonContainedUnsettableElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME = eINSTANCE.getMultiNonContainedUnsettableElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT = eINSTANCE - .getMultiNonContainedUnsettableElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl - * <em>Ref Single Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContainedNPL() - * @generated - */ - EClass REF_SINGLE_CONTAINED_NPL = eINSTANCE.getRefSingleContainedNPL(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleContainedNPL_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl - * <em>Ref Single Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED_NPL = eINSTANCE.getRefSingleNonContainedNPL(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleNonContainedNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl - * <em>Ref Multi Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContainedNPL() - * @generated - */ - EClass REF_MULTI_CONTAINED_NPL = eINSTANCE.getRefMultiContainedNPL(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiContainedNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl - * <em>Ref Multi Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_NPL = eINSTANCE.getRefMultiNonContainedNPL(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiNonContainedNPL_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl - * <em>Contained Element No Opposite</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getContainedElementNoOpposite() - * @generated - */ - EClass CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getContainedElementNoOpposite(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute CONTAINED_ELEMENT_NO_OPPOSITE__NAME = eINSTANCE.getContainedElementNoOpposite_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl - * <em>Gen Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleContained() - * @generated - */ - EClass GEN_REF_SINGLE_CONTAINED = eINSTANCE.getGenRefSingleContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference GEN_REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleContained_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl - * <em>Gen Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleNonContained() - * @generated - */ - EClass GEN_REF_SINGLE_NON_CONTAINED = eINSTANCE.getGenRefSingleNonContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleNonContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl - * <em>Gen Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiContained() - * @generated - */ - EClass GEN_REF_MULTI_CONTAINED = eINSTANCE.getGenRefMultiContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference GEN_REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl - * <em>Gen Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NON_CONTAINED = eINSTANCE.getGenRefMultiNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl - * <em>Impl Single Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER = eINSTANCE.getImplSingleRefContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl - * <em>Impl Single Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefContainedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl - * <em>Impl Single Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER = eINSTANCE.getImplSingleRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl - * <em>Impl Single Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefNonContainedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl - * <em>Impl Multi Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainer() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER = eINSTANCE.getImplMultiRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl - * <em>Impl Multi Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefNonContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl - * <em>Impl Multi Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainer() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER = eINSTANCE.getImplMultiRefContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl - * <em>Impl Multi Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefContainedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl - * <em>Impl Single Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER_NPL = eINSTANCE.getImplSingleRefContainerNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl - * <em>Impl Single Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getImplSingleRefNonContainerNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl - * <em>Impl Multi Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER_NPL = eINSTANCE.getImplMultiRefContainerNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl - * <em>Impl Multi Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getImplMultiRefNonContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl - * <em>Impl Contained Element NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplContainedElementNPL() - * @generated - */ - EClass IMPL_CONTAINED_ELEMENT_NPL = eINSTANCE.getImplContainedElementNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl - * <em>Gen Ref Multi NU Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NU_NON_CONTAINED = eINSTANCE.getGenRefMultiNUNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNUNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl - * <em>Gen Ref Map Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMapNonContained() - * @generated - */ - EClass GEN_REF_MAP_NON_CONTAINED = eINSTANCE.getGenRefMapNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc - * --> - * - * @generated - */ - EReference GEN_REF_MAP_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMapNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl - * <em>String To EObject</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getStringToEObject() - * @generated - */ - EClass STRING_TO_EOBJECT = eINSTANCE.getStringToEObject(); - - /** - * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute STRING_TO_EOBJECT__KEY = eINSTANCE.getStringToEObject_Key(); - - /** - * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference STRING_TO_EOBJECT__VALUE = eINSTANCE.getStringToEObject_Value(); - - } - } // model4Package 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 d373c3d2a9..e948bec1f1 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,9 +145,7 @@ public class model4Switch<T> RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: @@ -155,9 +153,7 @@ public class model4Switch<T> SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: @@ -165,9 +161,7 @@ public class model4Switch<T> RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: @@ -175,9 +169,7 @@ public class model4Switch<T> SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED: @@ -185,9 +177,7 @@ public class model4Switch<T> RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: @@ -195,9 +185,7 @@ public class model4Switch<T> MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED: @@ -205,9 +193,7 @@ public class model4Switch<T> RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: @@ -215,9 +201,7 @@ public class model4Switch<T> MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE: @@ -225,9 +209,7 @@ public class model4Switch<T> RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject; T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT: @@ -235,9 +217,7 @@ public class model4Switch<T> MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject; T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: @@ -245,9 +225,7 @@ public class model4Switch<T> RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: @@ -255,9 +233,7 @@ public class model4Switch<T> RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: @@ -265,9 +241,7 @@ public class model4Switch<T> RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: @@ -275,9 +249,7 @@ public class model4Switch<T> RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: @@ -285,9 +257,7 @@ public class model4Switch<T> ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: @@ -295,9 +265,7 @@ public class model4Switch<T> GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: @@ -305,9 +273,7 @@ public class model4Switch<T> GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: @@ -315,9 +281,7 @@ public class model4Switch<T> GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: @@ -325,9 +289,7 @@ public class model4Switch<T> GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: @@ -335,13 +297,9 @@ public class model4Switch<T> 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: @@ -349,13 +307,9 @@ public class model4Switch<T> 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: @@ -363,13 +317,9 @@ public class model4Switch<T> 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: @@ -377,13 +327,9 @@ public class model4Switch<T> 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: @@ -391,13 +337,9 @@ public class model4Switch<T> 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: @@ -405,13 +347,9 @@ public class model4Switch<T> 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: @@ -419,13 +357,9 @@ public class model4Switch<T> 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: @@ -433,13 +367,9 @@ public class model4Switch<T> 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: @@ -447,13 +377,9 @@ public class model4Switch<T> 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: @@ -461,13 +387,9 @@ public class model4Switch<T> 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: @@ -475,13 +397,9 @@ public class model4Switch<T> 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: @@ -489,13 +407,9 @@ public class model4Switch<T> 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: @@ -503,17 +417,11 @@ public class model4Switch<T> 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: @@ -521,9 +429,7 @@ public class model4Switch<T> GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject; T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MAP_NON_CONTAINED: @@ -531,9 +437,7 @@ public class model4Switch<T> GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject; T result = caseGenRefMapNonContained(genRefMapNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.STRING_TO_EOBJECT: @@ -542,9 +446,7 @@ public class model4Switch<T> Map.Entry<String, EObject> stringToEObject = (Map.Entry<String, EObject>)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/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java index 354a1f92c0..ff1d22ed3e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java @@ -49,7 +49,7 @@ public class ContainedElementNoOppositeImpl extends CDOObjectImpl implements Con @Override protected EClass eStaticClass() { - return model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE; + return model4Package.eINSTANCE.getContainedElementNoOpposite(); } /** @@ -70,7 +70,7 @@ public class ContainedElementNoOppositeImpl extends CDOObjectImpl implements Con */ public String getName() { - return (String)eGet(model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getContainedElementNoOpposite_Name(), true); } /** @@ -80,7 +80,7 @@ public class ContainedElementNoOppositeImpl extends CDOObjectImpl implements Con */ public void setName(String newName) { - eSet(model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, newName); + eSet(model4Package.eINSTANCE.getContainedElementNoOpposite_Name(), newName); } } // ContainedElementNoOppositeImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java index db370f0e25..dd994fbb2c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMapNonContainedImpl extends CDOObjectImpl implements GenRefMa @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MAP_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMapNonContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMapNonContainedImpl extends CDOObjectImpl implements GenRefMa @SuppressWarnings("unchecked") public EMap<String, EObject> getElements() { - return (EMap<String, EObject>)eGet(model4Package.Literals.GEN_REF_MAP_NON_CONTAINED__ELEMENTS, true); + return (EMap<String, EObject>)eGet(model4Package.eINSTANCE.getGenRefMapNonContained_Elements(), true); } } // GenRefMapNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java index 487391b417..8bcabccceb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMultiContainedImpl extends CDOObjectImpl implements GenRefMul @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMultiContainedImpl extends CDOObjectImpl implements GenRefMul @SuppressWarnings("unchecked") public EList<EObject> getElements() { - return (EList<EObject>)eGet(model4Package.Literals.GEN_REF_MULTI_CONTAINED__ELEMENTS, true); + return (EList<EObject>)eGet(model4Package.eINSTANCE.getGenRefMultiContained_Elements(), true); } } // GenRefMultiContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java index b25d0a1bbc..fdd8111553 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMultiNUNonContainedImpl extends CDOObjectImpl implements GenR @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NU_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNUNonContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMultiNUNonContainedImpl extends CDOObjectImpl implements GenR @SuppressWarnings("unchecked") public EList<EObject> getElements() { - return (EList<EObject>)eGet(model4Package.Literals.GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS, true); + return (EList<EObject>)eGet(model4Package.eINSTANCE.getGenRefMultiNUNonContained_Elements(), true); } } // GenRefMultiNUNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java index 738a26bdda..a531e6b1d8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMultiNonContainedImpl extends CDOObjectImpl implements GenRef @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNonContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMultiNonContainedImpl extends CDOObjectImpl implements GenRef @SuppressWarnings("unchecked") public EList<EObject> getElements() { - return (EList<EObject>)eGet(model4Package.Literals.GEN_REF_MULTI_NON_CONTAINED__ELEMENTS, true); + return (EList<EObject>)eGet(model4Package.eINSTANCE.getGenRefMultiNonContained_Elements(), true); } } // GenRefMultiNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java index 2583152cd4..7a7e62f7eb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java @@ -50,7 +50,7 @@ public class GenRefSingleContainedImpl extends CDOObjectImpl implements GenRefSi @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleContained(); } /** @@ -71,7 +71,7 @@ public class GenRefSingleContainedImpl extends CDOObjectImpl implements GenRefSi */ public EObject getElement() { - return (EObject)eGet(model4Package.Literals.GEN_REF_SINGLE_CONTAINED__ELEMENT, true); + return (EObject)eGet(model4Package.eINSTANCE.getGenRefSingleContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class GenRefSingleContainedImpl extends CDOObjectImpl implements GenRefSi */ public void setElement(EObject newElement) { - eSet(model4Package.Literals.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getGenRefSingleContained_Element(), newElement); } } // GenRefSingleContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java index b1092bc346..7676a23a32 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java @@ -50,7 +50,7 @@ public class GenRefSingleNonContainedImpl extends CDOObjectImpl implements GenRe @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleNonContained(); } /** @@ -71,7 +71,7 @@ public class GenRefSingleNonContainedImpl extends CDOObjectImpl implements GenRe */ public EObject getElement() { - return (EObject)eGet(model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, true); + return (EObject)eGet(model4Package.eINSTANCE.getGenRefSingleNonContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class GenRefSingleNonContainedImpl extends CDOObjectImpl implements GenRe */ public void setElement(EObject newElement) { - eSet(model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getGenRefSingleNonContained_Element(), newElement); } } // GenRefSingleNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java index 038196374b..4040ee3a3a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java @@ -51,7 +51,7 @@ public class ImplContainedElementNPLImpl extends CDOObjectImpl implements ImplCo @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_CONTAINED_ELEMENT_NPL; + return model4Package.eINSTANCE.getImplContainedElementNPL(); } /** @@ -72,7 +72,7 @@ public class ImplContainedElementNPLImpl extends CDOObjectImpl implements ImplCo */ public String getName() { - return (String)eGet(model4interfacesPackage.Literals.INAMED_ELEMENT__NAME, true); + return (String)eGet(model4interfacesPackage.eINSTANCE.getINamedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class ImplContainedElementNPLImpl extends CDOObjectImpl implements ImplCo */ public void setName(String newName) { - eSet(model4interfacesPackage.Literals.INAMED_ELEMENT__NAME, newName); + eSet(model4interfacesPackage.eINSTANCE.getINamedElement_Name(), newName); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java index f7e2d82bce..2c4258d98c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public IMultiRefContainer getParent() { - return (IMultiRefContainer)eGet(model4interfacesPackage.Literals.IMULTI_REF_CONTAINED_ELEMENT__PARENT, true); + return (IMultiRefContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainedElement_Parent(), true); } /** @@ -83,7 +83,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public void setParent(IMultiRefContainer newParent) { - eSet(model4interfacesPackage.Literals.IMULTI_REF_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getIMultiRefContainedElement_Parent(), newParent); } /** @@ -93,7 +93,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplMultiRefContainedElement_Name(), true); } /** @@ -103,7 +103,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplMultiRefContainedElement_Name(), newName); } } // ImplMultiRefContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java index b000e15772..466d58fce0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefContainerImpl extends CDOObjectImpl implements ImplMult @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefContainer(); } /** @@ -74,7 +74,8 @@ public class ImplMultiRefContainerImpl extends CDOObjectImpl implements ImplMult @SuppressWarnings("unchecked") public EList<IMultiRefContainedElement> getElements() { - return (EList<IMultiRefContainedElement>)eGet(model4interfacesPackage.Literals.IMULTI_REF_CONTAINER__ELEMENTS, true); + return (EList<IMultiRefContainedElement>)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainer_Elements(), + true); } } // ImplMultiRefContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java index 8977bfd917..390c0e6d72 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefContainerNPLImpl extends CDOObjectImpl implements ImplM @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefContainerNPL(); } /** @@ -75,7 +75,7 @@ public class ImplMultiRefContainerNPLImpl extends CDOObjectImpl implements ImplM public EList<IContainedElementNoParentLink> getElements() { return (EList<IContainedElementNoParentLink>)eGet( - model4interfacesPackage.Literals.IMULTI_REF_CONTAINER_NPL__ELEMENTS, true); + model4interfacesPackage.eINSTANCE.getIMultiRefContainerNPL_Elements(), true); } } // ImplMultiRefContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java index 0422c834b7..3017fedb77 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefNonContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public IMultiRefNonContainer getParent() { - return (IMultiRefNonContainer)eGet(model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT, true); + return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), true); } /** @@ -83,7 +83,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public void setParent(IMultiRefNonContainer newParent) { - eSet(model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), newParent); } /** @@ -93,7 +93,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplMultiRefNonContainedElement_Name(), true); } /** @@ -103,7 +103,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplMultiRefNonContainedElement_Name(), newName); } } // ImplMultiRefNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java index 125e0efa96..ea48661736 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefNonContainerImpl extends CDOObjectImpl implements ImplM @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefNonContainer(); } /** @@ -75,7 +75,7 @@ public class ImplMultiRefNonContainerImpl extends CDOObjectImpl implements ImplM public EList<IMultiRefNonContainedElement> getElements() { return (EList<IMultiRefNonContainedElement>)eGet( - model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINER__ELEMENTS, true); + model4interfacesPackage.eINSTANCE.getIMultiRefNonContainer_Elements(), true); } } // ImplMultiRefNonContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java index dad723532b..6479ac5427 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefNonContainerNPLImpl extends CDOObjectImpl implements Im @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefNonContainerNPL(); } /** @@ -75,7 +75,7 @@ public class ImplMultiRefNonContainerNPLImpl extends CDOObjectImpl implements Im public EList<IContainedElementNoParentLink> getElements() { return (EList<IContainedElementNoParentLink>)eGet( - model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS, true); + model4interfacesPackage.eINSTANCE.getIMultiRefNonContainerNPL_Elements(), true); } } // ImplMultiRefNonContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java index ffc2169656..eed9bd715f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public ISingleRefContainer getParent() { - return (ISingleRefContainer)eGet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, true); + return (ISingleRefContainer)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainedElement_Parent(), true); } /** @@ -83,7 +83,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public void setParent(ISingleRefContainer newParent) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefContainedElement_Parent(), newParent); } /** @@ -93,7 +93,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplSingleRefContainedElement_Name(), true); } /** @@ -103,7 +103,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplSingleRefContainedElement_Name(), newName); } } // ImplSingleRefContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java index 7d44aaed05..ca71ed8b06 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefContainerImpl extends CDOObjectImpl implements ImplSin @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefContainer(); } /** @@ -72,7 +72,7 @@ public class ImplSingleRefContainerImpl extends CDOObjectImpl implements ImplSin */ public ISingleRefContainedElement getElement() { - return (ISingleRefContainedElement)eGet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER__ELEMENT, true); + return (ISingleRefContainedElement)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainer_Element(), true); } /** @@ -82,7 +82,7 @@ public class ImplSingleRefContainerImpl extends CDOObjectImpl implements ImplSin */ public void setElement(ISingleRefContainedElement newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefContainer_Element(), newElement); } } // ImplSingleRefContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java index 61bd4da3af..ee66bc982f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefContainerNPL(); } /** @@ -72,7 +72,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl */ public IContainedElementNoParentLink getElement() { - return (IContainedElementNoParentLink)eGet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER_NPL__ELEMENT, + return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainerNPL_Element(), true); } @@ -83,7 +83,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl */ public void setElement(IContainedElementNoParentLink newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER_NPL__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefContainerNPL_Element(), newElement); } } // ImplSingleRefContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java index ace1ace171..0dd174a535 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefNonContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public ISingleRefNonContainer getParent() { - return (ISingleRefNonContainer)eGet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, + return (ISingleRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainedElement_Parent(), true); } @@ -84,7 +84,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public void setParent(ISingleRefNonContainer newParent) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainedElement_Parent(), newParent); } /** @@ -94,7 +94,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplSingleRefNonContainedElement_Name(), true); } /** @@ -104,7 +104,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplSingleRefNonContainedElement_Name(), newName); } } // ImplSingleRefNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java index 331c9a73e2..f7e7bf2e68 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefNonContainer(); } /** @@ -72,7 +72,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl */ public ISingleRefNonContainedElement getElement() { - return (ISingleRefNonContainedElement)eGet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER__ELEMENT, + return (ISingleRefNonContainedElement)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainer_Element(), true); } @@ -83,7 +83,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl */ public void setElement(ISingleRefNonContainedElement newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainer_Element(), newElement); } } // ImplSingleRefNonContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java index 7b93571a6d..48e987e46d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefNonContainerNPL(); } /** @@ -72,8 +72,8 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I */ public IContainedElementNoParentLink getElement() { - return (IContainedElementNoParentLink)eGet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT, - true); + return (IContainedElementNoParentLink)eGet( + model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), true); } /** @@ -83,7 +83,7 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I */ public void setElement(IContainedElementNoParentLink newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), newElement); } } // ImplSingleRefNonContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java index 9fd3a47d9f..58bc9413c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java @@ -51,7 +51,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiContainedElement(); } /** @@ -72,7 +72,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public String getName() { - return (String)eGet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getMultiContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public void setName(String newName) { - eSet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getMultiContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public RefMultiContained getParent() { - return (RefMultiContained)eGet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__PARENT, true); + return (RefMultiContained)eGet(model4Package.eINSTANCE.getMultiContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public void setParent(RefMultiContained newParent) { - eSet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getMultiContainedElement_Parent(), newParent); } } // MultiContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java index 08779f919b..ab7e3a5506 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java @@ -51,7 +51,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedElement(); } /** @@ -72,7 +72,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public String getName() { - return (String)eGet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getMultiNonContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public void setName(String newName) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getMultiNonContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public RefMultiNonContained getParent() { - return (RefMultiNonContained)eGet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__PARENT, true); + return (RefMultiNonContained)eGet(model4Package.eINSTANCE.getMultiNonContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public void setParent(RefMultiNonContained newParent) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getMultiNonContainedElement_Parent(), newParent); } } // MultiNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java index be53df6498..841854c211 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java @@ -51,7 +51,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedUnsettableElement(); } /** @@ -72,7 +72,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public String getName() { - return (String)eGet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public void setName(String newName) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public RefMultiNonContainedUnsettable getParent() { - return (RefMultiNonContainedUnsettable)eGet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, + return (RefMultiNonContainedUnsettable)eGet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent(), true); } @@ -103,7 +103,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public void setParent(RefMultiNonContainedUnsettable newParent) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent(), newParent); } /** @@ -113,7 +113,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public void unsetParent() { - eUnset(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT); + eUnset(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent()); } /** @@ -123,7 +123,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public boolean isSetParent() { - return eIsSet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT); + return eIsSet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent()); } } // MultiNonContainedUnsettableElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java index b91ca2f0ef..db1bfcd9db 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java @@ -51,7 +51,7 @@ public class RefMultiContainedImpl extends CDOObjectImpl implements RefMultiCont @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getRefMultiContained(); } /** @@ -73,7 +73,7 @@ public class RefMultiContainedImpl extends CDOObjectImpl implements RefMultiCont @SuppressWarnings("unchecked") public EList<MultiContainedElement> getElements() { - return (EList<MultiContainedElement>)eGet(model4Package.Literals.REF_MULTI_CONTAINED__ELEMENTS, true); + return (EList<MultiContainedElement>)eGet(model4Package.eINSTANCE.getRefMultiContained_Elements(), true); } } // RefMultiContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java index b80134dc6a..7f22e355c5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java @@ -51,7 +51,7 @@ public class RefMultiContainedNPLImpl extends CDOObjectImpl implements RefMultiC @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiContainedNPL(); } /** @@ -73,7 +73,7 @@ public class RefMultiContainedNPLImpl extends CDOObjectImpl implements RefMultiC @SuppressWarnings("unchecked") public EList<ContainedElementNoOpposite> getElements() { - return (EList<ContainedElementNoOpposite>)eGet(model4Package.Literals.REF_MULTI_CONTAINED_NPL__ELEMENTS, true); + return (EList<ContainedElementNoOpposite>)eGet(model4Package.eINSTANCE.getRefMultiContainedNPL_Elements(), true); } } // RefMultiContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java index 75832a1339..3605fdf084 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java @@ -51,7 +51,7 @@ public class RefMultiNonContainedImpl extends CDOObjectImpl implements RefMultiN @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getRefMultiNonContained(); } /** @@ -73,7 +73,7 @@ public class RefMultiNonContainedImpl extends CDOObjectImpl implements RefMultiN @SuppressWarnings("unchecked") public EList<MultiNonContainedElement> getElements() { - return (EList<MultiNonContainedElement>)eGet(model4Package.Literals.REF_MULTI_NON_CONTAINED__ELEMENTS, true); + return (EList<MultiNonContainedElement>)eGet(model4Package.eINSTANCE.getRefMultiNonContained_Elements(), true); } } // RefMultiNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java index d753f25561..db52e44aaa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java @@ -51,7 +51,7 @@ public class RefMultiNonContainedNPLImpl extends CDOObjectImpl implements RefMul @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiNonContainedNPL(); } /** @@ -73,7 +73,7 @@ public class RefMultiNonContainedNPLImpl extends CDOObjectImpl implements RefMul @SuppressWarnings("unchecked") public EList<ContainedElementNoOpposite> getElements() { - return (EList<ContainedElementNoOpposite>)eGet(model4Package.Literals.REF_MULTI_NON_CONTAINED_NPL__ELEMENTS, true); + return (EList<ContainedElementNoOpposite>)eGet(model4Package.eINSTANCE.getRefMultiNonContainedNPL_Elements(), true); } } // RefMultiNonContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java index 0bed3adb72..a5f364aaab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java @@ -51,7 +51,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE; + return model4Package.eINSTANCE.getRefMultiNonContainedUnsettable(); } /** @@ -74,7 +74,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements public EList<MultiNonContainedUnsettableElement> getElements() { return (EList<MultiNonContainedUnsettableElement>)eGet( - model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, true); + model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements(), true); } /** @@ -84,7 +84,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements */ public void unsetElements() { - eUnset(model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS); + eUnset(model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements()); } /** @@ -94,7 +94,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements */ public boolean isSetElements() { - return eIsSet(model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS); + return eIsSet(model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements()); } } // RefMultiNonContainedUnsettableImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java index f8e6de3b9a..a0cfd9f2a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java @@ -50,7 +50,7 @@ public class RefSingleContainedImpl extends CDOObjectImpl implements RefSingleCo @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getRefSingleContained(); } /** @@ -71,7 +71,7 @@ public class RefSingleContainedImpl extends CDOObjectImpl implements RefSingleCo */ public SingleContainedElement getElement() { - return (SingleContainedElement)eGet(model4Package.Literals.REF_SINGLE_CONTAINED__ELEMENT, true); + return (SingleContainedElement)eGet(model4Package.eINSTANCE.getRefSingleContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleContainedImpl extends CDOObjectImpl implements RefSingleCo */ public void setElement(SingleContainedElement newElement) { - eSet(model4Package.Literals.REF_SINGLE_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleContained_Element(), newElement); } } // RefSingleContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java index a7f904c105..a80ff8d726 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java @@ -50,7 +50,7 @@ public class RefSingleContainedNPLImpl extends CDOObjectImpl implements RefSingl @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleContainedNPL(); } /** @@ -71,7 +71,7 @@ public class RefSingleContainedNPLImpl extends CDOObjectImpl implements RefSingl */ public ContainedElementNoOpposite getElement() { - return (ContainedElementNoOpposite)eGet(model4Package.Literals.REF_SINGLE_CONTAINED_NPL__ELEMENT, true); + return (ContainedElementNoOpposite)eGet(model4Package.eINSTANCE.getRefSingleContainedNPL_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleContainedNPLImpl extends CDOObjectImpl implements RefSingl */ public void setElement(ContainedElementNoOpposite newElement) { - eSet(model4Package.Literals.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleContainedNPL_Element(), newElement); } } // RefSingleContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java index e7429ca272..08b62bc044 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java @@ -50,7 +50,7 @@ public class RefSingleNonContainedImpl extends CDOObjectImpl implements RefSingl @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getRefSingleNonContained(); } /** @@ -71,7 +71,7 @@ public class RefSingleNonContainedImpl extends CDOObjectImpl implements RefSingl */ public SingleNonContainedElement getElement() { - return (SingleNonContainedElement)eGet(model4Package.Literals.REF_SINGLE_NON_CONTAINED__ELEMENT, true); + return (SingleNonContainedElement)eGet(model4Package.eINSTANCE.getRefSingleNonContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleNonContainedImpl extends CDOObjectImpl implements RefSingl */ public void setElement(SingleNonContainedElement newElement) { - eSet(model4Package.Literals.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleNonContained_Element(), newElement); } } // RefSingleNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java index d3da32c0c3..59bdd90706 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java @@ -50,7 +50,7 @@ public class RefSingleNonContainedNPLImpl extends CDOObjectImpl implements RefSi @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleNonContainedNPL(); } /** @@ -71,7 +71,7 @@ public class RefSingleNonContainedNPLImpl extends CDOObjectImpl implements RefSi */ public ContainedElementNoOpposite getElement() { - return (ContainedElementNoOpposite)eGet(model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, true); + return (ContainedElementNoOpposite)eGet(model4Package.eINSTANCE.getRefSingleNonContainedNPL_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleNonContainedNPLImpl extends CDOObjectImpl implements RefSi */ public void setElement(ContainedElementNoOpposite newElement) { - eSet(model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleNonContainedNPL_Element(), newElement); } } // RefSingleNonContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java index fe9ae7ddaf..9b3b27b895 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java @@ -51,7 +51,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleContainedElement(); } /** @@ -72,7 +72,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public String getName() { - return (String)eGet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getSingleContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public void setName(String newName) { - eSet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getSingleContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public RefSingleContained getParent() { - return (RefSingleContained)eGet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__PARENT, true); + return (RefSingleContained)eGet(model4Package.eINSTANCE.getSingleContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public void setParent(RefSingleContained newParent) { - eSet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getSingleContainedElement_Parent(), newParent); } } // SingleContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java index a36c0dd3ab..c1600ee589 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java @@ -51,7 +51,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleNonContainedElement(); } /** @@ -72,7 +72,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public String getName() { - return (String)eGet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getSingleNonContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public void setName(String newName) { - eSet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getSingleNonContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public RefSingleNonContained getParent() { - return (RefSingleNonContained)eGet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__PARENT, true); + return (RefSingleNonContained)eGet(model4Package.eINSTANCE.getSingleNonContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public void setParent(RefSingleNonContained newParent) { - eSet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getSingleNonContainedElement_Parent(), newParent); } } // SingleNonContainedElementImpl 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 63fd3a1a3e..fdb8bb007f 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 @@ -52,7 +52,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr @Override protected EClass eStaticClass() { - return model4Package.Literals.STRING_TO_EOBJECT; + return model4Package.eINSTANCE.getStringToEObject(); } /** @@ -73,7 +73,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public String getTypedKey() { - return (String)eGet(model4Package.Literals.STRING_TO_EOBJECT__KEY, true); + return (String)eGet(model4Package.eINSTANCE.getStringToEObject_Key(), true); } /** @@ -83,7 +83,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public void setTypedKey(String newKey) { - eSet(model4Package.Literals.STRING_TO_EOBJECT__KEY, newKey); + eSet(model4Package.eINSTANCE.getStringToEObject_Key(), newKey); } /** @@ -93,7 +93,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public EObject getTypedValue() { - return (EObject)eGet(model4Package.Literals.STRING_TO_EOBJECT__VALUE, true); + return (EObject)eGet(model4Package.eINSTANCE.getStringToEObject_Value(), true); } /** @@ -103,7 +103,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public void setTypedValue(EObject newValue) { - eSet(model4Package.Literals.STRING_TO_EOBJECT__VALUE, newValue); + eSet(model4Package.eINSTANCE.getStringToEObject_Value(), newValue); } /** @@ -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 4a5623f122..7059bd177b 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,9 +348,7 @@ 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 @@ -1071,9 +1069,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -1196,9 +1192,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -1236,23 +1230,25 @@ 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(), 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); + 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); 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(), 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); + 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); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), - getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), + this.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); @@ -1261,30 +1257,32 @@ 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(), getRefSingleNonContained(), - getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), + this.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(), 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); + 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); 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(), 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); + 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); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), - getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), + this.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); @@ -1293,49 +1291,50 @@ 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(), 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); + 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); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_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); + initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), + this.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); initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class, "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 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(), 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); + initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(), + this.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(), getContainedElementNoOpposite(), null, "element", null, 0, 1, - RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), this.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(), 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(), 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); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, - RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), this.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(), getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), this.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 +1426,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), this.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/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java index 0b8919a539..1f36f342be 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java @@ -1835,630 +1835,4 @@ public interface model4Package extends EPackage */ model4Factory getmodel4Factory(); - /** - * <!-- begin-user-doc --> Defines literals for the meta objects that represent - * <ul> - * <li>each class,</li> - * <li>each feature of each class,</li> - * <li>each enum,</li> - * <li>and each data type</li> - * </ul> - * <!-- end-user-doc --> - * - * @generated - */ - interface Literals - { - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedImpl - * <em>Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleContained() - * @generated - */ - EClass REF_SINGLE_CONTAINED = eINSTANCE.getRefSingleContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getRefSingleContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl - * <em>Single Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getSingleContainedElement() - * @generated - */ - EClass SINGLE_CONTAINED_ELEMENT = eINSTANCE.getSingleContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute SINGLE_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference SINGLE_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl - * <em>Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleNonContained() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED = eINSTANCE.getRefSingleNonContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getRefSingleNonContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl - * <em>Single Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getSingleNonContainedElement() - * @generated - */ - EClass SINGLE_NON_CONTAINED_ELEMENT = eINSTANCE.getSingleNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute SINGLE_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleNonContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference SINGLE_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl - * <em>Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiContained() - * @generated - */ - EClass REF_MULTI_CONTAINED = eINSTANCE.getRefMultiContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl - * <em>Multi Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getMultiContainedElement() - * @generated - */ - EClass MULTI_CONTAINED_ELEMENT = eINSTANCE.getMultiContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute MULTI_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' container reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference MULTI_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl - * <em>Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiNonContained() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED = eINSTANCE.getRefMultiNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl - * <em>Multi Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getMultiNonContainedElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_ELEMENT = eINSTANCE.getMultiNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference MULTI_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedUnsettableImpl - * <em>Ref Multi Non Contained Unsettable</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedUnsettableImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiNonContainedUnsettable() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_UNSETTABLE = eINSTANCE.getRefMultiNonContainedUnsettable(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS = eINSTANCE.getRefMultiNonContainedUnsettable_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedUnsettableElementImpl - * <em>Multi Non Contained Unsettable Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedUnsettableElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getMultiNonContainedUnsettableElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT = eINSTANCE.getMultiNonContainedUnsettableElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME = eINSTANCE.getMultiNonContainedUnsettableElement_Name(); - - /** - * The meta object literal for the '<em><b>Parent</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT = eINSTANCE - .getMultiNonContainedUnsettableElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl - * <em>Ref Single Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleContainedNPL() - * @generated - */ - EClass REF_SINGLE_CONTAINED_NPL = eINSTANCE.getRefSingleContainedNPL(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleContainedNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl - * <em>Ref Single Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED_NPL = eINSTANCE.getRefSingleNonContainedNPL(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleNonContainedNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl - * <em>Ref Multi Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiContainedNPL() - * @generated - */ - EClass REF_MULTI_CONTAINED_NPL = eINSTANCE.getRefMultiContainedNPL(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiContainedNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl - * <em>Ref Multi Non Contained NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_NPL = eINSTANCE.getRefMultiNonContainedNPL(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiNonContainedNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl - * <em>Contained Element No Opposite</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getContainedElementNoOpposite() - * @generated - */ - EClass CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getContainedElementNoOpposite(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute CONTAINED_ELEMENT_NO_OPPOSITE__NAME = eINSTANCE.getContainedElementNoOpposite_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl - * <em>Gen Ref Single Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefSingleContained() - * @generated - */ - EClass GEN_REF_SINGLE_CONTAINED = eINSTANCE.getGenRefSingleContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' containment reference feature. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - */ - EReference GEN_REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl - * <em>Gen Ref Single Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefSingleNonContained() - * @generated - */ - EClass GEN_REF_SINGLE_NON_CONTAINED = eINSTANCE.getGenRefSingleNonContained(); - - /** - * The meta object literal for the '<em><b>Element</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleNonContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl - * <em>Gen Ref Multi Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMultiContained() - * @generated - */ - EClass GEN_REF_MULTI_CONTAINED = eINSTANCE.getGenRefMultiContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - EReference GEN_REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl - * <em>Gen Ref Multi Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMultiNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NON_CONTAINED = eINSTANCE.getGenRefMultiNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl - * <em>Impl Single Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER = eINSTANCE.getImplSingleRefContainer(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl - * <em>Impl Single Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl - * <em>Impl Single Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefNonContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER = eINSTANCE.getImplSingleRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl - * <em>Impl Single Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefNonContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl - * <em>Impl Multi Ref Non Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefNonContainer() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER = eINSTANCE.getImplMultiRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl - * <em>Impl Multi Ref Non Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefNonContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefNonContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl - * <em>Impl Multi Ref Container</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefContainer() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER = eINSTANCE.getImplMultiRefContainer(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl - * <em>Impl Multi Ref Contained Element</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefContainedElement(); - - /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl - * <em>Impl Single Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER_NPL = eINSTANCE.getImplSingleRefContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl - * <em>Impl Single Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getImplSingleRefNonContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl - * <em>Impl Multi Ref Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER_NPL = eINSTANCE.getImplMultiRefContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl - * <em>Impl Multi Ref Non Container NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getImplMultiRefNonContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl - * <em>Impl Contained Element NPL</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplContainedElementNPL() - * @generated - */ - EClass IMPL_CONTAINED_ELEMENT_NPL = eINSTANCE.getImplContainedElementNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl - * <em>Gen Ref Multi NU Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NU_NON_CONTAINED = eINSTANCE.getGenRefMultiNUNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNUNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl - * <em>Gen Ref Map Non Contained</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMapNonContained() - * @generated - */ - EClass GEN_REF_MAP_NON_CONTAINED = eINSTANCE.getGenRefMapNonContained(); - - /** - * The meta object literal for the '<em><b>Elements</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc - * --> - * - * @generated - */ - EReference GEN_REF_MAP_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMapNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl - * <em>String To EObject</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getStringToEObject() - * @generated - */ - EClass STRING_TO_EOBJECT = eINSTANCE.getStringToEObject(); - - /** - * The meta object literal for the '<em><b>Key</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute STRING_TO_EOBJECT__KEY = eINSTANCE.getStringToEObject_Key(); - - /** - * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference STRING_TO_EOBJECT__VALUE = eINSTANCE.getStringToEObject_Value(); - - } - } // model4Package 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 957e89213b..7e86c115d8 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,9 +145,7 @@ public class model4Switch<T> RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: @@ -155,9 +153,7 @@ public class model4Switch<T> SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: @@ -165,9 +161,7 @@ public class model4Switch<T> RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: @@ -175,9 +169,7 @@ public class model4Switch<T> SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED: @@ -185,9 +177,7 @@ public class model4Switch<T> RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: @@ -195,9 +185,7 @@ public class model4Switch<T> MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED: @@ -205,9 +193,7 @@ public class model4Switch<T> RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: @@ -215,9 +201,7 @@ public class model4Switch<T> MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE: @@ -225,9 +209,7 @@ public class model4Switch<T> RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject; T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT: @@ -235,9 +217,7 @@ public class model4Switch<T> MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject; T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: @@ -245,9 +225,7 @@ public class model4Switch<T> RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: @@ -255,9 +233,7 @@ public class model4Switch<T> RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: @@ -265,9 +241,7 @@ public class model4Switch<T> RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: @@ -275,9 +249,7 @@ public class model4Switch<T> RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: @@ -285,9 +257,7 @@ public class model4Switch<T> ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: @@ -295,9 +265,7 @@ public class model4Switch<T> GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: @@ -305,9 +273,7 @@ public class model4Switch<T> GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: @@ -315,9 +281,7 @@ public class model4Switch<T> GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: @@ -325,9 +289,7 @@ public class model4Switch<T> GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: @@ -335,13 +297,9 @@ public class model4Switch<T> 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: @@ -349,13 +307,9 @@ public class model4Switch<T> 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: @@ -363,13 +317,9 @@ public class model4Switch<T> 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: @@ -377,13 +327,9 @@ public class model4Switch<T> 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: @@ -391,13 +337,9 @@ public class model4Switch<T> 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: @@ -405,13 +347,9 @@ public class model4Switch<T> 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: @@ -419,13 +357,9 @@ public class model4Switch<T> 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: @@ -433,13 +367,9 @@ public class model4Switch<T> 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: @@ -447,13 +377,9 @@ public class model4Switch<T> 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: @@ -461,13 +387,9 @@ public class model4Switch<T> 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: @@ -475,13 +397,9 @@ public class model4Switch<T> 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: @@ -489,13 +407,9 @@ public class model4Switch<T> 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: @@ -503,17 +417,11 @@ public class model4Switch<T> 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: @@ -521,9 +429,7 @@ public class model4Switch<T> GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject; T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MAP_NON_CONTAINED: @@ -531,9 +437,7 @@ public class model4Switch<T> GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject; T result = caseGenRefMapNonContained(genRefMapNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.STRING_TO_EOBJECT: @@ -542,9 +446,7 @@ public class model4Switch<T> Map.Entry<String, EObject> stringToEObject = (Map.Entry<String, EObject>)theEObject; T result = caseStringToEObject(stringToEObject); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: |