diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model4/src/org')
100 files changed, 865 insertions, 317 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java index 5b599468d3..7bf654c2a0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ContainedElementNoOpposite.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java index 6bb40898a9..69a07aa427 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMapNonContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java index c702e77cf2..da0bc19206 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java index 9596315179..fbffc042ef 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNUNonContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java index 03b90b78a3..0ad11d55e9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefMultiNonContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java index 9c86793cb8..9aab8c771e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java index 7a13558154..02372644f7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/GenRefSingleNonContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java index 0e9fad0f10..4c6aeaa93e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplContainedElementNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java index 2822537dac..054cc7cefc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java index 861497c308..5410cee022 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainer.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java index 7a6a3a0f62..e6d89613ba 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefContainerNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java index 861635c0f6..d5b8b0dd2d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java index 91a0f080f7..9e564bee7b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainer.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java index ff07b95c68..614c3e3611 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplMultiRefNonContainerNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java index 400f69c158..7a0020bbc8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java index c80f7dafb6..e011865bc9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainer.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java index d20dfbee60..0779c70f2c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefContainerNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java index 9aca90da72..269389c5c8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java index 1c06fe3894..12385e3fbb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainer.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java index 7b261d0747..6a0fa42f13 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/ImplSingleRefNonContainerNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java index 29ff8e87b6..40c8de468c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java index 73d5396c76..32c244fc1d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java index 5380575882..94121e36dc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/MultiNonContainedUnsettableElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -62,7 +62,7 @@ public interface MultiNonContainedUnsettableElement extends EObject * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Parent</em>' reference. * @see #isSetParent() * @see #unsetParent() diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java index e046f184e2..0d28ecac22 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.emf.cdo.tests.model4.RefMultiContained#getElements <em>Elements</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model4.model4Package#getRefMultiContained() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java index 482aba6a3b..c5eef14e0d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiContainedNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java index 9a0eb23867..b7ab140298 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java index d639b269c6..46d13d5d37 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java index 2db0a46ccd..7c1825ad59 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefMultiNonContainedUnsettable.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -40,7 +40,7 @@ public interface RefMultiNonContainedUnsettable extends EObject * here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Elements</em>' reference list. * @see #isSetElements() * @see #unsetElements() diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java index bfbce1f7a6..75d8d11ac7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java index 0c993c6623..fb097ddb8a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleContainedNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java index 3da37acfe2..826eadfbab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContained.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java index 385fd81e76..f7ecc03533 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/RefSingleNonContainedNPL.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java index 085ccbc183..acb1e1495b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java index a7c1a1b916..678147ada6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/SingleNonContainedElement.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 5151803b85..6a47a01dfb 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 6d6c41bd78..150e40af04 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 a1242169a2..b148340ba6 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 6a7aea5fbf..8b45a123c6 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 44871a1ff3..a394875b56 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 93c4df4857..7d23f414fd 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 ac43013595..50815cabbd 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 793fe3ade0..ee7468e9ab 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 aa577d6e97..c99ce8f868 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 85d94169e6..1e6e5d1faa 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 2e44bcaef4..9120fa2a20 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 02831b9242..d6b54ae0f6 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -69,7 +69,8 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public IMultiRefNonContainer getParent() { - return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), true); + return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), + true); } /** 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 4649e050d5..fc70bfaeeb 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 7a8f903622..1b51635af1 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 c46eb8a087..2a9e295441 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 6148c99efc..f04e25720a 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 86a758b707..659752c9d7 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 5215354874..edff549562 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 bf3a485126..6b1438a19a 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 6d1cd93be7..3469572ece 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -68,8 +68,8 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I */ public IContainedElementNoParentLink getElement() { - return (IContainedElementNoParentLink)eGet( - model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), true); + return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), + true); } /** 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 bf957cc9f4..95a68a92df 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 6cded8a990..b64f05d7e5 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 ac0210bff7..7f407912f5 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 365c754a7e..d168ae1ba0 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 2813ef08f6..4a168a4488 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 33de3c2425..ada91444fe 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 3432ef2bf3..e99f7074fd 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 dea131bfcd..085230be6f 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 d643b263a4..739a2d7566 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 88bc907f13..57c713eaaf 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 6b4c75ef01..3a664539eb 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 a229ba6059..1499a2f136 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 ce69395071..bc33c8e0b1 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 be0e7ac829..3455a952d0 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ 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 cfb367afad..493de8e95c 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl#getTypedValue <em>Value</em>}</li> * </ul> * </p> - * + * * @generated */ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entry<String, EObject> @@ -114,7 +114,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 bc25132bab..b686c6dee2 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -279,7 +279,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also * performs initialization of the package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.emf.cdo.tests.model4.model4Package#eNS_URI * @see #init() @@ -298,7 +298,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -311,11 +311,13 @@ 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 - .get(eNS_URI) : new model4PackageImpl()); + model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE + .get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl()); isInited = true; @@ -963,7 +965,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -1085,7 +1089,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -1104,13 +1110,13 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Add supertypes to classes implSingleRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainer()); implSingleRefContainedElementEClass.getESuperTypes() - .add(themodel4interfacesPackage.getISingleRefContainedElement()); + .add(themodel4interfacesPackage.getISingleRefContainedElement()); implSingleRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainer()); - implSingleRefNonContainedElementEClass.getESuperTypes().add( - themodel4interfacesPackage.getISingleRefNonContainedElement()); + implSingleRefNonContainedElementEClass.getESuperTypes() + .add(themodel4interfacesPackage.getISingleRefNonContainedElement()); implMultiRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainer()); - implMultiRefNonContainedElementEClass.getESuperTypes().add( - themodel4interfacesPackage.getIMultiRefNonContainedElement()); + implMultiRefNonContainedElementEClass.getESuperTypes() + .add(themodel4interfacesPackage.getIMultiRefNonContainedElement()); implMultiRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainer()); implMultiRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainedElement()); implSingleRefContainerNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainerNPL()); @@ -1123,25 +1129,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Initialize classes and features; add operations and parameters initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), - this.getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), + "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), - this.getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), + "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), - this.getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), + getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1150,91 +1154,88 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), - this.getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), + getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), - this.getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), + "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(), - this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent", + null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), - this.getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), + getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), - this.getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), + "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), - this.getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, - RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); 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(), 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); + initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), + getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0, - 1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, + RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, - 0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, + RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, - 0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, + -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1, - ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1242,8 +1243,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package GenRefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1, GenRefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1278,8 +1279,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package ImplSingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class, "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1302,8 +1303,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1314,12 +1315,12 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, - GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java index 2d336ce1f9..97cf2bd535 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ContainedElementNoOppositeImpl.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -35,7 +35,7 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -88,8 +88,10 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, oldName, name)); + } } /** @@ -162,7 +164,9 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java index d27ba19e02..25b90cf580 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefMapNonContainedImpl.java @@ -40,7 +40,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN /** * The cached value of the '{@link #getElements() <em>Elements</em>}' map. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getElements() * @generated * @ordered @@ -74,8 +74,8 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN { if (elements == null) { - elements = new EcoreEMap<String, EObject>(model4Package.eINSTANCE.getStringToEObject(), - 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; } @@ -106,9 +106,13 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN { case model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS: if (coreType) + { return getElements(); + } else + { return getElements().map(); + } } return super.eGet(featureID, resolve, coreType); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java index f58d144336..d31a2dd850 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleContainedImpl.java @@ -86,9 +86,13 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -103,18 +107,26 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing { NotificationChain msgs = null; if (element != null) - msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs); + { + 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 = ((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)); + { + 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/model4/legacy/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java index 97fc51d96a..85b6b81466 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/GenRefSingleNonContainedImpl.java @@ -76,8 +76,10 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS if (element != oldElement) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, - model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); + { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, + oldElement, element)); + } } } return element; @@ -101,8 +103,10 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS EObject oldElement = element; element = newElement; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); + } } /** @@ -116,7 +120,9 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS { case model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java index 0cb1da80e3..fe9ff35d30 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplContainedElementNPLImpl.java @@ -37,7 +37,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -90,8 +90,10 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont String oldName = name; name = newName; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, - name)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, name)); + } } /** @@ -204,7 +206,9 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java index 8e77447a49..110320156d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefContainedElementImpl.java @@ -41,7 +41,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -83,7 +83,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public IMultiRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT) + { return null; + } return (IMultiRefContainer)eContainer(); } @@ -104,23 +106,33 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public void setParent(IMultiRefContainer newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null)) + || eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS, IMultiRefContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -141,8 +153,10 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -156,7 +170,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp { case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((IMultiRefContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -273,7 +289,9 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java index 4fc5fa087e..a80f53e223 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplMultiRefNonContainedElementImpl.java @@ -40,7 +40,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements /** * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getParent() * @generated * @ordered @@ -50,7 +50,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -98,8 +98,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -127,9 +129,13 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -144,18 +150,26 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -176,8 +190,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -191,8 +207,10 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); + } return basicSetParent((IMultiRefNonContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -224,7 +242,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME: return getName(); @@ -295,7 +315,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java index 4e856f8417..697ff7d7e4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainedElementImpl.java @@ -41,7 +41,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -83,7 +83,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public ISingleRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT) + { return null; + } return (ISingleRefContainer)eContainer(); } @@ -93,7 +95,8 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im */ public NotificationChain basicSetParent(ISingleRefContainer newParent, NotificationChain msgs) { - msgs = eBasicSetContainer((InternalEObject)newParent, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, msgs); + msgs = eBasicSetContainer((InternalEObject)newParent, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, + msgs); return msgs; } @@ -104,23 +107,33 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public void setParent(ISingleRefContainer newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null)) + || eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT, ISingleRefContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -141,8 +154,10 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -156,7 +171,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im { case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((ISingleRefContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -273,7 +290,9 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java index 1a8c4d76d8..79bdaa778a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerImpl.java @@ -87,9 +87,13 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -104,18 +108,26 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, newElement, newElement)); + } } /** @@ -129,8 +141,10 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl { case model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT: if (element != null) - msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs); + { + 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/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java index aa5e892286..6393190fd7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefContainerNPLImpl.java @@ -86,9 +86,13 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -103,18 +107,26 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi { NotificationChain msgs = null; if (element != null) - msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs); + { + 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 = ((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/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java index 7c1974e28d..d80bd7e115 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainedElementImpl.java @@ -40,7 +40,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements /** * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getParent() * @generated * @ordered @@ -50,7 +50,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -98,8 +98,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -127,9 +129,13 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -144,18 +150,26 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, - model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + { + eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, + newParent, newParent)); + } } /** @@ -176,8 +190,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -191,8 +207,10 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); + } return basicSetParent((ISingleRefNonContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -224,7 +242,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME: return getName(); @@ -295,7 +315,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java index 956b04f2fa..e504ecdaa5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerImpl.java @@ -78,8 +78,10 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, element)); + } } } return element; @@ -107,9 +109,13 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -124,20 +130,28 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, newElement, newElement)); + } } /** @@ -151,9 +165,11 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT: if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); + } return basicSetElement((ISingleRefNonContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -185,7 +201,9 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java index cae680a5aa..42f1b23818 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/ImplSingleRefNonContainerNPLImpl.java @@ -76,8 +76,10 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element)); + } } } return element; @@ -101,8 +103,10 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp IContainedElementNoParentLink oldElement = element; element = newElement; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element)); + } } /** @@ -116,7 +120,9 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java index 22b11ecad5..b1ad5e8365 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiContainedElementImpl.java @@ -40,7 +40,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -93,7 +93,10 @@ 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)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -103,7 +106,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public RefMultiContained getParent() { if (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT) + { return null; + } return (RefMultiContained)eContainer(); } @@ -124,23 +129,33 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public void setParent(RefMultiContained newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null)) + || 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)); + } } /** @@ -154,7 +169,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta { case model4Package.MULTI_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((RefMultiContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -271,7 +288,9 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java index dd1827be2a..dfb37e1dab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedElementImpl.java @@ -39,7 +39,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -58,7 +58,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo /** * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getParent() * @generated * @ordered @@ -102,8 +102,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -119,8 +121,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -148,9 +152,13 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -165,18 +173,26 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -190,8 +206,10 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo { case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); + } return basicSetParent((RefMultiNonContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -225,7 +243,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo return getName(); case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -294,7 +314,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java index b2a0259fdb..90540a204e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/MultiNonContainedUnsettableElementImpl.java @@ -39,7 +39,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -58,7 +58,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen /** * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getParent() * @generated * @ordered @@ -110,8 +110,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, oldName, name)); + } } /** @@ -127,8 +129,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -158,9 +162,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, newParent, !oldParentESet); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -175,22 +183,30 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else { boolean oldParentESet = parentESet; parentESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent, newParent, !oldParentESet)); + } } } @@ -209,9 +225,13 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, null, oldParentESet); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -229,15 +249,19 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen RefMultiNonContainedUnsettable.class, msgs); msgs = basicUnsetParent(msgs); if (msgs != null) + { msgs.dispatch(); + } } else { boolean oldParentESet = parentESet; parentESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, null, null, oldParentESet)); + } } } @@ -261,8 +285,10 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen { case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); + } return basicSetParent((RefMultiNonContainedUnsettable)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -296,7 +322,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen return getName(); case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -365,7 +393,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java index 97944dff84..47185d7bde 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefMultiNonContainedUnsettableImpl.java @@ -89,7 +89,9 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R public void unsetElements() { if (elements != null) + { ((InternalEList.Unsettable<?>)elements).unset(); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java index b3809e9928..1d8fe38f0b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedImpl.java @@ -86,9 +86,13 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -103,18 +107,26 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement)); + } } /** @@ -128,8 +140,10 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont { case model4Package.REF_SINGLE_CONTAINED__ELEMENT: if (element != null) - msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs); + { + 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/model4/legacy/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java index 4ee13ec771..a9a6744965 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleContainedNPLImpl.java @@ -86,9 +86,13 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -103,18 +107,26 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC { NotificationChain msgs = null; if (element != null) - msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs); + { + 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 = ((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)); + { + 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/model4/legacy/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java index dc11015649..56abceede8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedImpl.java @@ -77,8 +77,10 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN if (element != oldElement) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); + } } } return element; @@ -106,9 +108,13 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -123,18 +129,26 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { NotificationChain msgs = null; if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); + } if (newElement != null) + { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); + } msgs = basicSetElement(newElement, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, - newElement, newElement)); + { + eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement, + newElement)); + } } /** @@ -148,8 +162,10 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT: if (element != null) + { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); + } return basicSetElement((SingleNonContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -181,7 +197,9 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java index 5f601bbd1b..74f0e98141 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/RefSingleNonContainedNPLImpl.java @@ -76,8 +76,10 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing if (element != oldElement) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, - model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element)); + { + eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, + oldElement, element)); + } } } return element; @@ -101,8 +103,10 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing ContainedElementNoOpposite oldElement = element; element = newElement; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element)); + } } /** @@ -116,7 +120,9 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing { case model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT: if (resolve) + { return getElement(); + } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java index 3d1e5c0f4a..d3fb0744ca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleContainedElementImpl.java @@ -40,7 +40,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -93,7 +93,10 @@ 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)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -103,7 +106,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public RefSingleContained getParent() { if (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT) + { return null; + } return (RefSingleContained)eContainer(); } @@ -124,23 +129,33 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public void setParent(RefSingleContained newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null)) + || 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)); + } } /** @@ -154,7 +169,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon { case model4Package.SINGLE_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((RefSingleContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -271,7 +288,9 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java index b71652cd6b..ac77c11eef 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/SingleNonContainedElementImpl.java @@ -39,7 +39,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getName() * @generated * @ordered @@ -58,7 +58,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single /** * The cached value of the '{@link #getParent() <em>Parent</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getParent() * @generated * @ordered @@ -102,8 +102,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single String oldName = name; name = newName; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__NAME, oldName, name)); + } } /** @@ -119,8 +121,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single if (parent != oldParent) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); + } } } return parent; @@ -148,9 +152,13 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -165,18 +173,26 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single { NotificationChain msgs = null; if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); + } } /** @@ -190,8 +206,10 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single { case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) + { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); + } return basicSetParent((RefSingleNonContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -225,7 +243,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single return getName(); case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT: if (resolve) + { return getParent(); + } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -294,7 +314,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java index 7efaa03a69..6257cff8b3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/StringToEObjectImpl.java @@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <li>{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl#getTypedValue <em>Value</em>}</li> * </ul> * </p> - * + * * @generated */ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry<String, EObject> @@ -38,7 +38,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< /** * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -48,7 +48,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -102,7 +102,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__KEY, oldKey, key)); + } } /** @@ -123,7 +125,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< EObject oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__VALUE, oldValue, value)); + } } /** @@ -206,7 +210,9 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -230,7 +236,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/model4/legacy/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java index 6bf8c7840e..43d83170ff 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/impl/model4PackageImpl.java @@ -279,7 +279,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also * performs initialization of the package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.emf.cdo.tests.legacy.model4.model4Package#eNS_URI * @see #init() @@ -298,7 +298,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link model4Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -311,11 +311,13 @@ 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 - .get(eNS_URI) : new model4PackageImpl()); + model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE + .get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new model4PackageImpl()); isInited = true; @@ -963,7 +965,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -1085,7 +1089,9 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -1104,13 +1110,13 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Add supertypes to classes implSingleRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainer()); implSingleRefContainedElementEClass.getESuperTypes() - .add(themodel4interfacesPackage.getISingleRefContainedElement()); + .add(themodel4interfacesPackage.getISingleRefContainedElement()); implSingleRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefNonContainer()); - implSingleRefNonContainedElementEClass.getESuperTypes().add( - themodel4interfacesPackage.getISingleRefNonContainedElement()); + implSingleRefNonContainedElementEClass.getESuperTypes() + .add(themodel4interfacesPackage.getISingleRefNonContainedElement()); implMultiRefNonContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefNonContainer()); - implMultiRefNonContainedElementEClass.getESuperTypes().add( - themodel4interfacesPackage.getIMultiRefNonContainedElement()); + implMultiRefNonContainedElementEClass.getESuperTypes() + .add(themodel4interfacesPackage.getIMultiRefNonContainedElement()); implMultiRefContainerEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainer()); implMultiRefContainedElementEClass.getESuperTypes().add(themodel4interfacesPackage.getIMultiRefContainedElement()); implSingleRefContainerNPLEClass.getESuperTypes().add(themodel4interfacesPackage.getISingleRefContainerNPL()); @@ -1123,25 +1129,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Initialize classes and features; add operations and parameters initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), - this.getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), + "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), - this.getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), + "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), - this.getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), + getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1150,91 +1154,88 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), - this.getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), + getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), - this.getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), + "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(), - this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), "parent", + null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), - this.getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), + getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(multiNonContainedElementEClass, MultiNonContainedElement.class, "MultiNonContainedElement", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), - this.getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), + "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), - this.getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, - RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); 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(), 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); + initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), + getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0, - 1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, + RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, - 0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, + RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, - 0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, + -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getContainedElementNoOpposite_Name(), ecorePackage.getEString(), "name", null, 0, 1, - ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + ContainedElementNoOpposite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(genRefSingleContainedEClass, GenRefSingleContained.class, "GenRefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1242,8 +1243,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package GenRefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(genRefSingleNonContainedEClass, GenRefSingleNonContained.class, "GenRefSingleNonContained", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenRefSingleNonContained_Element(), ecorePackage.getEObject(), null, "element", null, 0, 1, GenRefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1278,8 +1279,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package ImplSingleRefNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(implMultiRefNonContainerEClass, ImplMultiRefNonContainer.class, "ImplMultiRefNonContainer", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(implMultiRefNonContainedElementEClass, ImplMultiRefNonContainedElement.class, "ImplMultiRefNonContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1302,8 +1303,8 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(implSingleRefNonContainerNPLEClass, ImplSingleRefNonContainerNPL.class, "ImplSingleRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(implMultiRefContainerNPLEClass, ImplMultiRefContainerNPL.class, "ImplMultiRefContainerNPL", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(implMultiRefNonContainerNPLEClass, ImplMultiRefNonContainerNPL.class, "ImplMultiRefNonContainerNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1314,12 +1315,12 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMultiNUNonContainedEClass, GenRefMultiNUNonContained.class, "GenRefMultiNUNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getGenRefMultiNUNonContained_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, - GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + GenRefMultiNUNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java index da1e0080bf..60f2f8f140 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/model4Package.java @@ -660,7 +660,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplSingleRefNonContainerImpl <em>Impl Single Ref Non Container</em>}' class. @@ -711,7 +712,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0; + int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 0; /** * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!-- @@ -720,7 +722,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefNonContainerImpl <em>Impl Multi Ref Non Container</em>}' class. @@ -771,7 +774,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0; + int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 0; /** * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class. @@ -780,7 +784,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefContainerImpl <em>Impl Multi Ref Container</em>}' class. @@ -841,7 +846,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplSingleRefContainerNPLImpl <em>Impl Single Ref Container NPL</em>}' class. @@ -894,7 +900,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0; + int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + + 0; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplMultiRefContainerNPLImpl <em>Impl Multi Ref Container NPL</em>}' class. @@ -947,7 +954,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0; + int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + + 0; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.ImplContainedElementNPLImpl <em>Impl Contained Element NPL</em>}' class. @@ -973,7 +981,8 @@ public interface model4Package extends EPackage, org.eclipse.emf.cdo.tests.model * @generated * @ordered */ - int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1; + int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.legacy.impl.GenRefMultiNUNonContainedImpl <em>Gen Ref Multi NU Non Contained</em>}' class. diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java index 1617538456..6d54ac6ba5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/legacy/util/model4Switch.java @@ -153,7 +153,9 @@ 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: @@ -161,7 +163,9 @@ 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: @@ -169,7 +173,9 @@ 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: @@ -177,7 +183,9 @@ 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,7 +193,9 @@ 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: @@ -193,7 +203,9 @@ 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: @@ -201,7 +213,9 @@ 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: @@ -209,7 +223,9 @@ 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: @@ -217,7 +233,9 @@ 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: @@ -225,7 +243,9 @@ 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: @@ -233,7 +253,9 @@ 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: @@ -241,7 +263,9 @@ 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: @@ -249,7 +273,9 @@ 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: @@ -257,7 +283,9 @@ 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: @@ -265,7 +293,9 @@ 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: @@ -273,7 +303,9 @@ 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: @@ -281,7 +313,9 @@ 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: @@ -289,7 +323,9 @@ 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: @@ -297,7 +333,9 @@ 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: @@ -305,9 +343,13 @@ 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: @@ -315,9 +357,13 @@ 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: @@ -325,9 +371,13 @@ 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: @@ -335,9 +385,13 @@ 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: @@ -345,9 +399,13 @@ 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: @@ -355,9 +413,13 @@ 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: @@ -365,9 +427,13 @@ 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: @@ -375,9 +441,13 @@ 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: @@ -385,9 +455,13 @@ 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: @@ -395,9 +469,13 @@ 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: @@ -405,9 +483,13 @@ 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: @@ -415,9 +497,13 @@ 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: @@ -425,11 +511,17 @@ 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: @@ -437,7 +529,9 @@ 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: @@ -445,7 +539,9 @@ 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: @@ -454,7 +550,9 @@ 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/model4Factory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java index 61a75bb05b..942359ee88 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Factory.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -54,7 +54,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Single Non Contained Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Single Non Contained Element</em>'. * @generated */ @@ -121,7 +121,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Ref Single Non Contained NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Ref Single Non Contained NPL</em>'. * @generated */ @@ -146,7 +146,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Contained Element No Opposite</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Contained Element No Opposite</em>'. * @generated */ @@ -163,7 +163,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Gen Ref Single Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Gen Ref Single Non Contained</em>'. * @generated */ @@ -205,7 +205,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Impl Single Ref Non Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Impl Single Ref Non Container</em>'. * @generated */ @@ -223,7 +223,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Impl Multi Ref Non Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Impl Multi Ref Non Container</em>'. * @generated */ @@ -258,7 +258,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Impl Single Ref Container NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Impl Single Ref Container NPL</em>'. * @generated */ @@ -276,7 +276,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Impl Multi Ref Container NPL</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Impl Multi Ref Container NPL</em>'. * @generated */ @@ -302,7 +302,7 @@ public interface model4Factory extends EFactory /** * Returns a new object of class '<em>Gen Ref Multi NU Non Contained</em>'. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @return a new object of class '<em>Gen Ref Multi NU Non Contained</em>'. * @generated */ 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 486ef5b7cb..b48842b34f 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -72,7 +72,7 @@ public interface model4Package extends EPackage /** * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -356,7 +356,7 @@ public interface model4Package extends EPackage /** * The number of structural features of the '<em>Multi Non Contained Unsettable Element</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -374,7 +374,7 @@ public interface model4Package extends EPackage /** * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -506,7 +506,7 @@ public interface model4Package extends EPackage /** * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -612,7 +612,7 @@ public interface model4Package extends EPackage /** * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -659,7 +659,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_SINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl <em>Impl Single Ref Non Container</em>}' class. @@ -710,16 +711,18 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0; + int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 0; /** * The number of structural features of the '<em>Impl Single Ref Non Contained Element</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated * @ordered */ - int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl <em>Impl Multi Ref Non Container</em>}' class. @@ -770,7 +773,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 0; + int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 0; /** * The number of structural features of the '<em>Impl Multi Ref Non Contained Element</em>' class. @@ -779,7 +783,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_MULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl <em>Impl Multi Ref Container</em>}' class. @@ -840,7 +845,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + 1; + int IMPL_MULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl <em>Impl Single Ref Container NPL</em>}' class. @@ -854,7 +860,7 @@ public interface model4Package extends EPackage /** * The feature id for the '<em><b>Element</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -893,7 +899,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0; + int IMPL_SINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL_FEATURE_COUNT + + 0; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl <em>Impl Multi Ref Container NPL</em>}' class. @@ -946,7 +953,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + 0; + int IMPL_MULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT = model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL_FEATURE_COUNT + + 0; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl <em>Impl Contained Element NPL</em>}' class. @@ -972,7 +980,8 @@ public interface model4Package extends EPackage * @generated * @ordered */ - int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + 1; + int IMPL_CONTAINED_ELEMENT_NPL_FEATURE_COUNT = model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK_FEATURE_COUNT + + 1; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl <em>Gen Ref Multi NU Non Contained</em>}' class. @@ -1275,7 +1284,7 @@ public interface model4Package extends EPackage * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedUnsettable#getElements <em>Elements</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Elements</em>'. * @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedUnsettable#getElements() * @see #getRefMultiNonContainedUnsettable() @@ -1296,7 +1305,7 @@ public interface model4Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getName <em>Name</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getName() * @see #getMultiNonContainedUnsettableElement() @@ -1308,7 +1317,7 @@ public interface model4Package extends EPackage * Returns the meta object for the reference ' * {@link org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getParent <em>Parent</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the reference '<em>Parent</em>'. * @see org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement#getParent() * @see #getMultiNonContainedUnsettableElement() @@ -1389,7 +1398,7 @@ public interface model4Package extends EPackage * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL#getElements <em>Elements</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Elements</em>'. * @see org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL#getElements() * @see #getRefMultiNonContainedNPL() @@ -1490,7 +1499,7 @@ public interface model4Package extends EPackage * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained#getElements <em>Elements</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Elements</em>'. * @see org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained#getElements() * @see #getGenRefMultiNonContained() @@ -1549,7 +1558,7 @@ public interface model4Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement#getName <em>Name</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement#getName() * @see #getImplSingleRefNonContainedElement() @@ -1579,7 +1588,7 @@ public interface model4Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement#getName <em>Name</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement#getName() * @see #getImplMultiRefNonContainedElement() @@ -1674,7 +1683,7 @@ public interface model4Package extends EPackage * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained#getElements <em>Elements</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the reference list '<em>Elements</em>'. * @see org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained#getElements() * @see #getGenRefMultiNUNonContained() 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 315caa4126..2512bd8dc7 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 @@ -143,7 +143,9 @@ 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: @@ -151,7 +153,9 @@ 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: @@ -159,7 +163,9 @@ 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: @@ -167,7 +173,9 @@ 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: @@ -175,7 +183,9 @@ 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: @@ -183,7 +193,9 @@ 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: @@ -191,7 +203,9 @@ 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: @@ -199,7 +213,9 @@ 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: @@ -207,7 +223,9 @@ 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: @@ -215,7 +233,9 @@ 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: @@ -223,7 +243,9 @@ 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: @@ -231,7 +253,9 @@ 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: @@ -239,7 +263,9 @@ 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: @@ -247,7 +273,9 @@ 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: @@ -255,7 +283,9 @@ 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: @@ -263,7 +293,9 @@ 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: @@ -271,7 +303,9 @@ 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: @@ -279,7 +313,9 @@ 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: @@ -287,7 +323,9 @@ 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: @@ -295,9 +333,13 @@ 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: @@ -305,9 +347,13 @@ 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: @@ -315,9 +361,13 @@ 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: @@ -325,9 +375,13 @@ 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: @@ -335,9 +389,13 @@ 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: @@ -345,9 +403,13 @@ 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: @@ -355,9 +417,13 @@ 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: @@ -365,9 +431,13 @@ 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: @@ -375,9 +445,13 @@ 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: @@ -385,9 +459,13 @@ 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: @@ -395,9 +473,13 @@ 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: @@ -405,9 +487,13 @@ 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: @@ -415,11 +501,17 @@ 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: @@ -427,7 +519,9 @@ 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: @@ -435,7 +529,9 @@ 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: @@ -444,7 +540,9 @@ 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: |