diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model2/src')
56 files changed, 938 insertions, 396 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java index e1951dbf29..e22918f8ac 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/EnumListHolder.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 */ @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.emf.cdo.tests.model2.EnumListHolder#getEnumList <em>Enum List</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getEnumListHolder() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java index 8c6730ae0f..cb084e1062 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/MapHolder.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 * @@ -102,7 +102,7 @@ public interface MapHolder extends EObject * a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>String To Address Containment Map</em>' map. * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToAddressContainmentMap() * @model mapType= @@ -120,7 +120,7 @@ public interface MapHolder extends EObject * description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>String To Address Reference Map</em>' map. * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_StringToAddressReferenceMap() * @model mapType= @@ -138,7 +138,7 @@ public interface MapHolder extends EObject * description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>EObject To EObject Map</em>' map. * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectMap() * @model mapType= @@ -156,7 +156,7 @@ public interface MapHolder extends EObject * of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>EObject To EObject Key Contained Map</em>' map. * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectKeyContainedMap() * @model mapType= @@ -174,7 +174,7 @@ public interface MapHolder extends EObject * of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>EObject To EObject Both Contained Map</em>' map. * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectBothContainedMap() * @model mapType= @@ -192,7 +192,7 @@ public interface MapHolder extends EObject * more of a description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>EObject To EObject Value Contained Map</em>' map. * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getMapHolder_EObjectToEObjectValueContainedMap() * @model mapType= diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java index c01df2e814..722647bf4c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Factory.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.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java index 4596d1b58c..f232e28b22 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Model2Package.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 */ @@ -141,7 +141,7 @@ public interface Model2Package extends EPackage /** * The number of structural features of the '<em>Task Container</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -150,7 +150,7 @@ public interface Model2Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model2.impl.TaskImpl <em>Task</em>}' class. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.cdo.tests.model2.impl.TaskImpl * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getTask() * @generated @@ -202,7 +202,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Unsettable Boolean</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -291,7 +291,7 @@ public interface Model2Package extends EPackage /** * The number of structural features of the '<em>Unsettable1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -309,7 +309,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Unsettable Boolean</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -510,7 +510,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Byte</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -519,7 +519,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -528,7 +528,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -537,7 +537,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Double</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -546,7 +546,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Float</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -555,7 +555,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Int</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -564,7 +564,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Long</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -573,7 +573,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Short</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -582,7 +582,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable String</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -591,7 +591,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable VAT</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -600,7 +600,7 @@ public interface Model2Package extends EPackage /** * The number of structural features of the '<em>Not Unsettable</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -627,7 +627,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Byte</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -636,7 +636,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Char</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -645,7 +645,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -654,7 +654,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Double</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -663,7 +663,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Float</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -672,7 +672,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Int</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -681,7 +681,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Long</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -690,7 +690,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable Short</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -699,7 +699,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable String</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -708,7 +708,7 @@ public interface Model2Package extends EPackage /** * The feature id for the '<em><b>Not Unsettable VAT</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -1083,7 +1083,7 @@ public interface Model2Package extends EPackage /** * The number of structural features of the '<em>EObject To EObject Both Contained Map</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -1117,7 +1117,7 @@ public interface Model2Package extends EPackage /** * The number of structural features of the '<em>EObject To EObject Value Contained Map</em>' class. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated * @ordered */ @@ -1162,7 +1162,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode <em>Discount Code</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Discount Code</em>'. * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getDiscountCode() * @see #getSpecialPurchaseOrder() @@ -1174,7 +1174,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the containment reference ' * {@link org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress <em>Shipping Address</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Shipping Address</em>'. * @see org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder#getShippingAddress() * @see #getSpecialPurchaseOrder() @@ -1205,7 +1205,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.Task <em>Task</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Task</em>'. * @see org.eclipse.emf.cdo.tests.model2.Task * @generated @@ -1245,7 +1245,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.Unsettable1 <em>Unsettable1</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Unsettable1</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable1 * @generated @@ -1385,7 +1385,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableByte <em>Unsettable Byte</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Byte</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableByte() * @see #getUnsettable2WithDefault() @@ -1397,7 +1397,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableChar <em>Unsettable Char</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Char</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableChar() * @see #getUnsettable2WithDefault() @@ -1409,7 +1409,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableDate <em>Unsettable Date</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Date</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableDate() * @see #getUnsettable2WithDefault() @@ -1431,7 +1431,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableFloat <em>Unsettable Float</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Float</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableFloat() * @see #getUnsettable2WithDefault() @@ -1443,7 +1443,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableInt <em>Unsettable Int</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Int</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableInt() * @see #getUnsettable2WithDefault() @@ -1455,7 +1455,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableLong <em>Unsettable Long</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Long</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableLong() * @see #getUnsettable2WithDefault() @@ -1467,7 +1467,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableShort <em>Unsettable Short</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable Short</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableShort() * @see #getUnsettable2WithDefault() @@ -1489,7 +1489,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableVAT <em>Unsettable VAT</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Unsettable VAT</em>'. * @see org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault#getUnsettableVAT() * @see #getUnsettable2WithDefault() @@ -1510,7 +1510,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrBefore <em>Attr Before</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Attr Before</em>'. * @see org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrBefore() * @see #getPersistentContainment() @@ -1533,7 +1533,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrAfter <em>Attr After</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Attr After</em>'. * @see org.eclipse.emf.cdo.tests.model2.PersistentContainment#getAttrAfter() * @see #getPersistentContainment() @@ -1554,7 +1554,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.TransientContainer#getAttrBefore <em>Attr Before</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Attr Before</em>'. * @see org.eclipse.emf.cdo.tests.model2.TransientContainer#getAttrBefore() * @see #getTransientContainer() @@ -1606,7 +1606,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableByte <em>Not Unsettable Byte</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Byte</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableByte() * @see #getNotUnsettable() @@ -1618,7 +1618,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableChar <em>Not Unsettable Char</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Char</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableChar() * @see #getNotUnsettable() @@ -1630,7 +1630,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDate <em>Not Unsettable Date</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Date</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDate() * @see #getNotUnsettable() @@ -1642,7 +1642,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDouble <em>Not Unsettable Double</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Double</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableDouble() * @see #getNotUnsettable() @@ -1654,7 +1654,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableFloat <em>Not Unsettable Float</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Float</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableFloat() * @see #getNotUnsettable() @@ -1666,7 +1666,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableInt <em>Not Unsettable Int</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Int</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableInt() * @see #getNotUnsettable() @@ -1678,7 +1678,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableLong <em>Not Unsettable Long</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Long</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableLong() * @see #getNotUnsettable() @@ -1690,7 +1690,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableShort <em>Not Unsettable Short</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable Short</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableShort() * @see #getNotUnsettable() @@ -1702,7 +1702,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableString <em>Not Unsettable String</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable String</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableString() * @see #getNotUnsettable() @@ -1714,7 +1714,7 @@ public interface Model2Package extends EPackage * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableVAT <em>Not Unsettable VAT</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the attribute '<em>Not Unsettable VAT</em>'. * @see org.eclipse.emf.cdo.tests.model2.NotUnsettable#getNotUnsettableVAT() * @see #getNotUnsettable() @@ -1844,7 +1844,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model2.MapHolder <em>Map Holder</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Map Holder</em>'. * @see org.eclipse.emf.cdo.tests.model2.MapHolder * @generated @@ -2046,7 +2046,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Containment Map</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>String To Address Containment Map</em>'. * @see java.util.Map.Entry * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.model1.Address" @@ -2069,7 +2069,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Value</em>'. * @see java.util.Map.Entry * @see #getStringToAddressContainmentMap() @@ -2080,7 +2080,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Address Reference Map</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>String To Address Reference Map</em>'. * @see java.util.Map.Entry * @model keyDataType="org.eclipse.emf.ecore.EString" valueType="org.eclipse.emf.cdo.tests.model1.Address" @@ -2113,7 +2113,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Map</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>EObject To EObject Map</em>'. * @see java.util.Map.Entry * @model keyType="org.eclipse.emf.ecore.EObject" valueType="org.eclipse.emf.ecore.EObject" @@ -2146,7 +2146,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for class '{@link java.util.Map.Entry <em>EObject To EObject Key Contained Map</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>EObject To EObject Key Contained Map</em>'. * @see java.util.Map.Entry * @model keyType="org.eclipse.emf.ecore.EObject" keyContainment="true" valueType="org.eclipse.emf.ecore.EObject" @@ -2157,7 +2157,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Key</em>'. * @see java.util.Map.Entry * @see #getEObjectToEObjectKeyContainedMap() @@ -2190,7 +2190,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Key</em>'. * @see java.util.Map.Entry * @see #getEObjectToEObjectBothContainedMap() @@ -2201,7 +2201,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Value</em>'. * @see java.util.Map.Entry * @see #getEObjectToEObjectBothContainedMap() @@ -2234,7 +2234,7 @@ public interface Model2Package extends EPackage /** * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for the containment reference '<em>Value</em>'. * @see java.util.Map.Entry * @see #getEObjectToEObjectValueContainedMap() diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java index 22d9439817..3f270a532f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettable.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.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java index c64ec4e303..c2d12c379b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/NotUnsettableWithDefault.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.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java index bd0cfab7af..faff9971c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/PersistentContainment.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.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java index 425d6d2a91..94221a4a1b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/SpecialPurchaseOrder.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.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java index c9d6cf8b09..c4bfecfd43 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Task.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 */ @@ -100,7 +100,7 @@ public interface Task extends EObject /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model2.Task#isDone <em>Done</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @param value * the new value of the '<em>Done</em>' attribute. * @see #isDone() diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java index a2f0c57dd5..5979e3b403 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TaskContainer.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.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java index bbb007ca64..5bb43d8ab6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/TransientContainer.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 */ @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.emf.cdo.tests.model2.TransientContainer#getParent <em>Parent</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model2.Model2Package#getTransientContainer() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java index e648165e49..3c54b19ca2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable1.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.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java index 5e978cdfc1..86fc7eee40 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/Unsettable2WithDefault.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 */ @@ -102,7 +102,7 @@ public interface Unsettable2WithDefault extends EObject * description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Unsettable Byte</em>' attribute. * @see #isSetUnsettableByte() * @see #unsetUnsettableByte() @@ -357,7 +357,7 @@ public interface Unsettable2WithDefault extends EObject * here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Unsettable Int</em>' attribute. * @see #isSetUnsettableInt() * @see #unsetUnsettableInt() @@ -408,7 +408,7 @@ public interface Unsettable2WithDefault extends EObject * description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Unsettable Long</em>' attribute. * @see #isSetUnsettableLong() * @see #unsetUnsettableLong() @@ -459,7 +459,7 @@ public interface Unsettable2WithDefault extends EObject * description here... * </p> * <!-- end-user-doc --> - * + * * @return the value of the '<em>Unsettable Short</em>' attribute. * @see #isSetUnsettableShort() * @see #unsetUnsettableShort() diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java index 4efc4961c9..ab0b4f562c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.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 * @@ -116,7 +116,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java index 8887b435db..80aa41f0a8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.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 * @@ -116,7 +116,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java index 49104d010d..647050e2fa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.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 * @@ -116,7 +116,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap. 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java index 58a889f626..29afd8c85c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.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 * @@ -116,7 +116,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java index 2004506e86..c48e73b5bf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.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 */ @@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EClass; * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.EnumListHolderImpl#getEnumList <em>Enum List</em>}</li> * </ul> * </p> - * + * * @generated */ public class EnumListHolderImpl extends CDOObjectImpl implements EnumListHolder diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java index c80ed07517..c393f51a1d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.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 * @@ -116,7 +116,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java index dc7e54661d..51435d901a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java index e88e8b7f20..12d612aadc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Model2PackageImpl.java @@ -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 */ @@ -166,7 +166,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package * 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.model2.Model2Package#eNS_URI * @see #init() @@ -185,7 +185,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package /** * 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 Model2Package#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 --> @@ -198,11 +198,13 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public static Model2Package init() { if (isInited) + { return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI); + } // Obtain or create and register package - Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE - .get(eNS_URI) : new Model2PackageImpl()); + Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE + .get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl()); isInited = true; @@ -1183,7 +1185,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -1327,7 +1331,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -1357,14 +1363,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1, + initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1, TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer", - null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1, + Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT, @@ -1414,8 +1420,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, - 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1, + Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, @@ -1438,8 +1444,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString", "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, - 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1, + Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT, @@ -1447,10 +1453,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPersistentContainment_Children(), this.getTransientContainer(), - this.getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - !IS_ORDERED); + initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(), + "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1460,52 +1465,51 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), - this.getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(), + "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, - 0, 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0, + 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, - 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1, + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, - 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1, + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); - initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", "true", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1519,11 +1523,11 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package "1979-03-15T07:12:59", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", - "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, - !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", - "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, - !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1541,31 +1545,31 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMapHolder_IntegerToStringMap(), this.getIntegerToStringMap(), null, "integerToStringMap", null, - 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, 0, - -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToVATMap(), this.getStringToVATMap(), null, "stringToVATMap", null, 0, -1, + initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToAddressContainmentMap(), this.getStringToAddressContainmentMap(), null, + initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1, + MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1, + MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null, "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToAddressReferenceMap(), this.getStringToAddressReferenceMap(), null, + initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null, "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectMap(), this.getEObjectToEObjectMap(), null, "eObjectToEObjectMap", - null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0, + -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), this.getEObjectToEObjectKeyContainedMap(), null, + initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null, "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), this.getEObjectToEObjectBothContainedMap(), null, + initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null, "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), this.getEObjectToEObjectValueContainedMap(), null, + initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null, "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java index 85c1e11810..b90c909e4a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java index f1d9271fc6..b62dec9648 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java index 4973b6acc8..a1d3d1825f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java index bb96c6ee88..560a8448c5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java index 0c47943ff7..ac2de64381 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.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 * @@ -117,7 +117,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java index 58bec4c747..5c8fd17e33 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.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 * @@ -117,7 +117,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java index 51342af237..0eb5dd6baa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.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 * @@ -116,7 +116,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En 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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java index a6c7e98c69..5ab2d3c05e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.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 * @@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl#getTypedValue <em>Value</em>}</li> * </ul> * </p> - * + * * @generated */ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry<String, VAT> @@ -117,7 +117,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry if (hash == -1) { Object theKey = getKey(); - hash = (theKey == null ? 0 : theKey.hashCode()); + hash = theKey == null ? 0 : theKey.hashCode(); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java index abe55921f3..adcbee162a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java index 0b5aecc128..a170c946fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java index d0aac68c8c..0fb5db451a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java index 023ea0a768..565dad305b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.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.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java index b2d6741c1b..db202f7168 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java index 1bbd201d2d..b2e89395c8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectBothContainedMapImpl.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 * @@ -100,9 +100,13 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, oldKey, newKey); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -117,18 +121,26 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements { NotificationChain msgs = null; if (key != null) - msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs); + { + msgs = ((InternalEObject)key).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs); + } if (newKey != null) - msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs); + { + msgs = ((InternalEObject)newKey).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, null, msgs); + } msgs = basicSetTypedKey(newKey, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, newKey, newKey)); + } } /** @@ -153,9 +165,13 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, oldValue, newValue); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -170,18 +186,26 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements { NotificationChain msgs = null; if (value != null) - msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs); + { + msgs = ((InternalEObject)value).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs); + } if (newValue != null) - msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs); + { + msgs = ((InternalEObject)newValue).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, null, msgs); + } msgs = basicSetTypedValue(newValue, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, newValue, newValue)); + } } /** @@ -288,7 +312,7 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java index d59d2e442c..b92d6a21d1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectKeyContainedMapImpl.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 * @@ -100,9 +100,13 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, oldKey, newKey); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -117,18 +121,26 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements { NotificationChain msgs = null; if (key != null) - msgs = ((InternalEObject)key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs); + { + msgs = ((InternalEObject)key).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs); + } if (newKey != null) - msgs = ((InternalEObject)newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs); + { + msgs = ((InternalEObject)newKey).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, null, msgs); + } msgs = basicSetTypedKey(newKey, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, newKey, newKey)); + } } /** @@ -144,8 +156,10 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements if (value != oldValue) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value)); + } } } return value; @@ -169,8 +183,10 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements EObject oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, oldValue, value)); + } } /** @@ -201,7 +217,9 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements return getTypedKey(); case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE: if (resolve) + { return getTypedValue(); + } return basicGetTypedValue(); } return super.eGet(featureID, resolve, coreType); @@ -277,7 +295,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java index 0169e27d46..af93e2e980 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectMapImpl.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 * @@ -41,7 +41,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -90,8 +90,10 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En if (key != oldKey) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey, key)); + } } } return key; @@ -115,7 +117,9 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En EObject oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY, oldKey, key)); + } } /** @@ -131,8 +135,10 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En if (value != oldValue) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, value)); + } } } return value; @@ -156,8 +162,10 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En EObject oldValue = value; value = newValue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, - value)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE, oldValue, value)); + } } /** @@ -171,11 +179,15 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En { case Model2Package.EOBJECT_TO_EOBJECT_MAP__KEY: if (resolve) + { return getTypedKey(); + } return basicGetTypedKey(); case Model2Package.EOBJECT_TO_EOBJECT_MAP__VALUE: if (resolve) + { return getTypedValue(); + } return basicGetTypedValue(); } return super.eGet(featureID, resolve, coreType); @@ -251,7 +263,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java index 886e41fd4c..cd8c596119 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EObjectToEObjectValueContainedMapImpl.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 * @@ -42,7 +42,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -91,8 +91,10 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement if (key != oldKey) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key)); + } } } return key; @@ -116,8 +118,10 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement EObject oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, oldKey, key)); + } } /** @@ -142,9 +146,13 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, oldValue, newValue); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -159,18 +167,26 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement { NotificationChain msgs = null; if (value != null) - msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs); + { + msgs = ((InternalEObject)value).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs); + } if (newValue != null) - msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs); + { + msgs = ((InternalEObject)newValue).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, null, msgs); + } msgs = basicSetTypedValue(newValue, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, - Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, newValue, newValue)); + { + eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, + newValue, newValue)); + } } /** @@ -199,7 +215,9 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement { case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY: if (resolve) + { return getTypedKey(); + } return basicGetTypedKey(); case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE: return getTypedValue(); @@ -277,7 +295,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java index d7db969c8f..ae53ac3918 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/EnumListHolderImpl.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -30,7 +30,7 @@ import java.util.Collection; * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EnumListHolderImpl#getEnumList <em>Enum List</em>}</li> * </ul> * </p> - * + * * @generated */ public class EnumListHolderImpl extends EObjectImpl implements EnumListHolder @@ -149,7 +149,9 @@ public class EnumListHolderImpl extends EObjectImpl implements EnumListHolder public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (enumList: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java index 2d4d044b56..0a6a9a0fcd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/IntegerToStringMapImpl.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 class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent /** * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -50,7 +50,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -114,7 +114,9 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent Integer oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__KEY, oldKey, key)); + } } /** @@ -135,7 +137,10 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent String oldValue = value; value = newValue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, Model2Package.INTEGER_TO_STRING_MAP__VALUE, oldValue, value)); + } } /** @@ -218,7 +223,9 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -244,7 +251,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java index e5cd8d4cbd..9445b01490 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/MapHolderImpl.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 * @@ -99,7 +99,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder /** * The cached value of the '{@link #getEObjectToEObjectMap() <em>EObject To EObject Map</em>}' map. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getEObjectToEObjectMap() * @generated * @ordered @@ -188,8 +188,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder { if (stringToVATMap == null) { - stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.eINSTANCE.getStringToVATMap(), - StringToVATMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP); + stringToVATMap = new EcoreEMap<String, VAT>(Model2Package.eINSTANCE.getStringToVATMap(), StringToVATMapImpl.class, + this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP); } return stringToVATMap; } @@ -247,8 +247,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder if (eObjectToEObjectKeyContainedMap == null) { eObjectToEObjectKeyContainedMap = new EcoreEMap<EObject, EObject>( - Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(), EObjectToEObjectKeyContainedMapImpl.class, - this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP); + Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(), EObjectToEObjectKeyContainedMapImpl.class, this, + Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP); } return eObjectToEObjectKeyContainedMap; } @@ -325,49 +325,85 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder { case Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP: if (coreType) + { return getIntegerToStringMap(); + } else + { return getIntegerToStringMap().map(); + } case Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP: if (coreType) + { return getStringToStringMap(); + } else + { return getStringToStringMap().map(); + } case Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP: if (coreType) + { return getStringToVATMap(); + } else + { return getStringToVATMap().map(); + } case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP: if (coreType) + { return getStringToAddressContainmentMap(); + } else + { return getStringToAddressContainmentMap().map(); + } case Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP: if (coreType) + { return getStringToAddressReferenceMap(); + } else + { return getStringToAddressReferenceMap().map(); + } case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP: if (coreType) + { return getEObjectToEObjectMap(); + } else + { return getEObjectToEObjectMap().map(); + } case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP: if (coreType) + { return getEObjectToEObjectKeyContainedMap(); + } else + { return getEObjectToEObjectKeyContainedMap().map(); + } case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP: if (coreType) + { return getEObjectToEObjectBothContainedMap(); + } else + { return getEObjectToEObjectBothContainedMap().map(); + } case Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP: if (coreType) + { return getEObjectToEObjectValueContainedMap(); + } else + { return getEObjectToEObjectValueContainedMap().map(); + } } return super.eGet(featureID, resolve, coreType); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java index c9c7d42b68..e184c1b0a2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Model2PackageImpl.java @@ -166,7 +166,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package * 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.model2.Model2Package#eNS_URI * @see #init() @@ -185,7 +185,7 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package /** * 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 Model2Package#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 --> @@ -198,11 +198,13 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public static Model2Package init() { if (isInited) + { return (Model2Package)EPackage.Registry.INSTANCE.getEPackage(Model2Package.eNS_URI); + } // Obtain or create and register package - Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE - .get(eNS_URI) : new Model2PackageImpl()); + Model2PackageImpl theModel2Package = (Model2PackageImpl)(EPackage.Registry.INSTANCE + .get(eNS_URI) instanceof Model2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model2PackageImpl()); isInited = true; @@ -1183,7 +1185,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void createPackageContents() { if (isCreated) + { return; + } isCreated = true; // Create classes and their features @@ -1327,7 +1331,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package public void initializePackageContents() { if (isInitialized) + { return; + } isInitialized = true; // Initialize package @@ -1357,14 +1363,14 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEClass(taskContainerEClass, TaskContainer.class, "TaskContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTaskContainer_Tasks(), this.getTask(), this.getTask_TaskContainer(), "tasks", null, 0, -1, + initEReference(getTaskContainer_Tasks(), getTask(), getTask_TaskContainer(), "tasks", null, 0, -1, TaskContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(taskEClass, Task.class, "Task", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTask_TaskContainer(), this.getTaskContainer(), this.getTaskContainer_Tasks(), "taskContainer", - null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTask_TaskContainer(), getTaskContainer(), getTaskContainer_Tasks(), "taskContainer", null, 0, 1, + Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Description(), ecorePackage.getEString(), "description", null, 0, 1, Task.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTask_Done(), ecorePackage.getEBoolean(), "done", null, 0, 1, Task.class, !IS_TRANSIENT, @@ -1414,8 +1420,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getUnsettable2WithDefault_UnsettableByte(), ecorePackage.getEByte(), "unsettableByte", "3", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, - 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getUnsettable2WithDefault_UnsettableChar(), ecorePackage.getEChar(), "unsettableChar", "\'x\'", 0, 1, + Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getUnsettable2WithDefault_UnsettableDate(), ecorePackage.getEDate(), "unsettableDate", "2009-12-21T15:12:59", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, @@ -1438,8 +1444,8 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getUnsettable2WithDefault_UnsettableString(), ecorePackage.getEString(), "unsettableString", "\"eike\"", 0, 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, - 1, Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getUnsettable2WithDefault_UnsettableVAT(), theModel1Package.getVAT(), "unsettableVAT", "vat15", 0, 1, + Unsettable2WithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(persistentContainmentEClass, PersistentContainment.class, "PersistentContainment", !IS_ABSTRACT, @@ -1447,10 +1453,9 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getPersistentContainment_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPersistentContainment_Children(), this.getTransientContainer(), - this.getTransientContainer_Parent(), "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - !IS_ORDERED); + initEReference(getPersistentContainment_Children(), getTransientContainer(), getTransientContainer_Parent(), + "children", null, 0, -1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPersistentContainment_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, PersistentContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1460,52 +1465,51 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package initEAttribute(getTransientContainer_AttrBefore(), ecorePackage.getEString(), "attrBefore", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTransientContainer_Parent(), this.getPersistentContainment(), - this.getPersistentContainment_Children(), "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getTransientContainer_Parent(), getPersistentContainment(), getPersistentContainment_Children(), + "parent", null, 0, 1, TransientContainer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTransientContainer_AttrAfter(), ecorePackage.getEString(), "attrAfter", null, 0, 1, TransientContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(notUnsettableEClass, NotUnsettable.class, "NotUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, - 0, 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + initEAttribute(getNotUnsettable_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", null, 0, + 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableByte(), ecorePackage.getEByte(), "notUnsettableByte", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableChar(), ecorePackage.getEChar(), "notUnsettableChar", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableDate(), ecorePackage.getEDate(), "notUnsettableDate", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, - 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEAttribute(getNotUnsettable_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", null, 0, 1, + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableLong(), ecorePackage.getELong(), "notUnsettableLong", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableShort(), ecorePackage.getEShort(), "notUnsettableShort", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, - 1, NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEAttribute(getNotUnsettable_NotUnsettableString(), ecorePackage.getEString(), "notUnsettableString", null, 0, 1, + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEAttribute(getNotUnsettable_NotUnsettableVAT(), theModel1Package.getVAT(), "notUnsettableVAT", null, 0, 1, - NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + NotUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); - initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(notUnsettableWithDefaultEClass, NotUnsettableWithDefault.class, "NotUnsettableWithDefault", !IS_ABSTRACT, + !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getNotUnsettableWithDefault_NotUnsettableBoolean(), ecorePackage.getEBoolean(), "notUnsettableBoolean", "true", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1519,11 +1523,11 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package "1979-03-15T07:12:59", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettableWithDefault_NotUnsettableDouble(), ecorePackage.getEDouble(), "notUnsettableDouble", - "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, - !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + "3.3", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettableWithDefault_NotUnsettableFloat(), ecorePackage.getEFloat(), "notUnsettableFloat", - "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, - !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + "4.4", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getNotUnsettableWithDefault_NotUnsettableInt(), ecorePackage.getEInt(), "notUnsettableInt", "5", 0, 1, NotUnsettableWithDefault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1541,31 +1545,31 @@ public class Model2PackageImpl extends EPackageImpl implements Model2Package !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(mapHolderEClass, MapHolder.class, "MapHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMapHolder_IntegerToStringMap(), this.getIntegerToStringMap(), null, "integerToStringMap", null, - 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, 0, - -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToVATMap(), this.getStringToVATMap(), null, "stringToVATMap", null, 0, -1, + initEReference(getMapHolder_IntegerToStringMap(), getIntegerToStringMap(), null, "integerToStringMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToAddressContainmentMap(), this.getStringToAddressContainmentMap(), null, + initEReference(getMapHolder_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, 0, -1, + MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMapHolder_StringToVATMap(), getStringToVATMap(), null, "stringToVATMap", null, 0, -1, + MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMapHolder_StringToAddressContainmentMap(), getStringToAddressContainmentMap(), null, "stringToAddressContainmentMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_StringToAddressReferenceMap(), this.getStringToAddressReferenceMap(), null, + initEReference(getMapHolder_StringToAddressReferenceMap(), getStringToAddressReferenceMap(), null, "stringToAddressReferenceMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectMap(), this.getEObjectToEObjectMap(), null, "eObjectToEObjectMap", - null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getMapHolder_EObjectToEObjectMap(), getEObjectToEObjectMap(), null, "eObjectToEObjectMap", null, 0, + -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), this.getEObjectToEObjectKeyContainedMap(), null, + initEReference(getMapHolder_EObjectToEObjectKeyContainedMap(), getEObjectToEObjectKeyContainedMap(), null, "eObjectToEObjectKeyContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), this.getEObjectToEObjectBothContainedMap(), null, + initEReference(getMapHolder_EObjectToEObjectBothContainedMap(), getEObjectToEObjectBothContainedMap(), null, "eObjectToEObjectBothContainedMap", null, 0, -1, MapHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), this.getEObjectToEObjectValueContainedMap(), null, + initEReference(getMapHolder_EObjectToEObjectValueContainedMap(), getEObjectToEObjectValueContainedMap(), null, "eObjectToEObjectValueContainedMap", null, 0, -1, MapHolder.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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java index 89a53094ac..26ab5d10cb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableImpl.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 * @@ -49,7 +49,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isNotUnsettableBoolean() * @generated * @ordered @@ -59,7 +59,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isNotUnsettableBoolean() * @generated * @ordered @@ -69,7 +69,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableByte() * @generated * @ordered @@ -79,7 +79,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableByte() * @generated * @ordered @@ -89,7 +89,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableChar() * @generated * @ordered @@ -99,7 +99,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableChar() * @generated * @ordered @@ -109,7 +109,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDate() * @generated * @ordered @@ -119,7 +119,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDate() * @generated * @ordered @@ -129,7 +129,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDouble() * @generated * @ordered @@ -139,7 +139,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDouble() * @generated * @ordered @@ -149,7 +149,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableFloat() * @generated * @ordered @@ -159,7 +159,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableFloat() * @generated * @ordered @@ -169,7 +169,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableInt() <em>Not Unsettable Int</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableInt() * @generated * @ordered @@ -189,7 +189,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableLong() * @generated * @ordered @@ -199,7 +199,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableLong() * @generated * @ordered @@ -209,7 +209,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableShort() * @generated * @ordered @@ -219,7 +219,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableShort() * @generated * @ordered @@ -229,7 +229,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableString() * @generated * @ordered @@ -239,7 +239,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The cached value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableString() * @generated * @ordered @@ -249,7 +249,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable /** * The default value of the '{@link #getNotUnsettableVAT() <em>Not Unsettable VAT</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableVAT() * @generated * @ordered @@ -303,8 +303,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable boolean oldNotUnsettableBoolean = notUnsettableBoolean; notUnsettableBoolean = newNotUnsettableBoolean; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean, notUnsettableBoolean)); + } } /** @@ -325,8 +327,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable byte oldNotUnsettableByte = notUnsettableByte; notUnsettableByte = newNotUnsettableByte; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte, notUnsettableByte)); + } } /** @@ -347,8 +351,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable char oldNotUnsettableChar = notUnsettableChar; notUnsettableChar = newNotUnsettableChar; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar, notUnsettableChar)); + } } /** @@ -369,8 +375,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable Date oldNotUnsettableDate = notUnsettableDate; notUnsettableDate = newNotUnsettableDate; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE, oldNotUnsettableDate, notUnsettableDate)); + } } /** @@ -391,8 +399,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable double oldNotUnsettableDouble = notUnsettableDouble; notUnsettableDouble = newNotUnsettableDouble; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble, notUnsettableDouble)); + } } /** @@ -413,8 +423,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable float oldNotUnsettableFloat = notUnsettableFloat; notUnsettableFloat = newNotUnsettableFloat; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat, notUnsettableFloat)); + } } /** @@ -435,8 +447,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable int oldNotUnsettableInt = notUnsettableInt; notUnsettableInt = newNotUnsettableInt; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt)); + } } /** @@ -457,8 +471,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable long oldNotUnsettableLong = notUnsettableLong; notUnsettableLong = newNotUnsettableLong; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG, oldNotUnsettableLong, notUnsettableLong)); + } } /** @@ -479,8 +495,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable short oldNotUnsettableShort = notUnsettableShort; notUnsettableShort = newNotUnsettableShort; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort, notUnsettableShort)); + } } /** @@ -501,8 +519,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable String oldNotUnsettableString = notUnsettableString; notUnsettableString = newNotUnsettableString; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING, oldNotUnsettableString, notUnsettableString)); + } } /** @@ -523,8 +543,10 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable VAT oldNotUnsettableVAT = notUnsettableVAT; notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT)); + } } /** @@ -670,8 +692,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR: return notUnsettableChar != NOT_UNSETTABLE_CHAR_EDEFAULT; case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE: - return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null : !NOT_UNSETTABLE_DATE_EDEFAULT - .equals(notUnsettableDate); + return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null + : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate); case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE: return notUnsettableDouble != NOT_UNSETTABLE_DOUBLE_EDEFAULT; case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT: @@ -683,8 +705,8 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT: return notUnsettableShort != NOT_UNSETTABLE_SHORT_EDEFAULT; case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING: - return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null : !NOT_UNSETTABLE_STRING_EDEFAULT - .equals(notUnsettableString); + return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null + : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString); case Model2Package.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT: return notUnsettableVAT != NOT_UNSETTABLE_VAT_EDEFAULT; } @@ -699,7 +721,9 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (notUnsettableBoolean: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java index e4b17f2820..8ea200d1bc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/NotUnsettableWithDefaultImpl.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 * @@ -52,7 +52,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isNotUnsettableBoolean() * @generated * @ordered @@ -62,7 +62,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #isNotUnsettableBoolean() <em>Not Unsettable Boolean</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isNotUnsettableBoolean() * @generated * @ordered @@ -72,7 +72,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableByte() * @generated * @ordered @@ -82,7 +82,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableByte() <em>Not Unsettable Byte</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableByte() * @generated * @ordered @@ -92,7 +92,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableChar() * @generated * @ordered @@ -102,7 +102,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableChar() <em>Not Unsettable Char</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableChar() * @generated * @ordered @@ -112,18 +112,18 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDate() * @generated * @ordered */ - protected static final Date NOT_UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString( - EcorePackage.eINSTANCE.getEDate(), "1979-03-15T07:12:59"); + protected static final Date NOT_UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE + .createFromString(EcorePackage.eINSTANCE.getEDate(), "1979-03-15T07:12:59"); /** * The cached value of the '{@link #getNotUnsettableDate() <em>Not Unsettable Date</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDate() * @generated * @ordered @@ -133,7 +133,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDouble() * @generated * @ordered @@ -143,7 +143,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableDouble() <em>Not Unsettable Double</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableDouble() * @generated * @ordered @@ -153,7 +153,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableFloat() * @generated * @ordered @@ -163,7 +163,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableFloat() <em>Not Unsettable Float</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableFloat() * @generated * @ordered @@ -173,7 +173,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableInt() <em>Not Unsettable Int</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableInt() * @generated * @ordered @@ -193,7 +193,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableLong() * @generated * @ordered @@ -203,7 +203,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableLong() <em>Not Unsettable Long</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableLong() * @generated * @ordered @@ -213,7 +213,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableShort() * @generated * @ordered @@ -223,7 +223,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableShort() <em>Not Unsettable Short</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableShort() * @generated * @ordered @@ -233,7 +233,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableString() * @generated * @ordered @@ -243,7 +243,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The cached value of the '{@link #getNotUnsettableString() <em>Not Unsettable String</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableString() * @generated * @ordered @@ -253,7 +253,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse /** * The default value of the '{@link #getNotUnsettableVAT() <em>Not Unsettable VAT</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getNotUnsettableVAT() * @generated * @ordered @@ -307,9 +307,11 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse boolean oldNotUnsettableBoolean = notUnsettableBoolean; notUnsettableBoolean = newNotUnsettableBoolean; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, oldNotUnsettableBoolean, notUnsettableBoolean)); + } } /** @@ -330,8 +332,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse byte oldNotUnsettableByte = notUnsettableByte; notUnsettableByte = newNotUnsettableByte; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, oldNotUnsettableByte, notUnsettableByte)); + } } /** @@ -352,8 +356,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse char oldNotUnsettableChar = notUnsettableChar; notUnsettableChar = newNotUnsettableChar; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, oldNotUnsettableChar, notUnsettableChar)); + } } /** @@ -374,8 +380,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse Date oldNotUnsettableDate = notUnsettableDate; notUnsettableDate = newNotUnsettableDate; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, oldNotUnsettableDate, notUnsettableDate)); + } } /** @@ -396,8 +404,11 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse double oldNotUnsettableDouble = notUnsettableDouble; notUnsettableDouble = newNotUnsettableDouble; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, - Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble, notUnsettableDouble)); + Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, oldNotUnsettableDouble, + notUnsettableDouble)); + } } /** @@ -418,8 +429,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse float oldNotUnsettableFloat = notUnsettableFloat; notUnsettableFloat = newNotUnsettableFloat; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, oldNotUnsettableFloat, notUnsettableFloat)); + } } /** @@ -440,8 +453,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse int oldNotUnsettableInt = notUnsettableInt; notUnsettableInt = newNotUnsettableInt; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, oldNotUnsettableInt, notUnsettableInt)); + } } /** @@ -462,8 +477,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse long oldNotUnsettableLong = notUnsettableLong; notUnsettableLong = newNotUnsettableLong; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, oldNotUnsettableLong, notUnsettableLong)); + } } /** @@ -484,8 +501,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse short oldNotUnsettableShort = notUnsettableShort; notUnsettableShort = newNotUnsettableShort; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, oldNotUnsettableShort, notUnsettableShort)); + } } /** @@ -506,8 +525,11 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse String oldNotUnsettableString = notUnsettableString; notUnsettableString = newNotUnsettableString; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, - Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString, notUnsettableString)); + Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, oldNotUnsettableString, + notUnsettableString)); + } } /** @@ -528,8 +550,10 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse VAT oldNotUnsettableVAT = notUnsettableVAT; notUnsettableVAT = newNotUnsettableVAT == null ? NOT_UNSETTABLE_VAT_EDEFAULT : newNotUnsettableVAT; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, oldNotUnsettableVAT, notUnsettableVAT)); + } } /** @@ -675,8 +699,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR: return notUnsettableChar != NOT_UNSETTABLE_CHAR_EDEFAULT; case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE: - return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null : !NOT_UNSETTABLE_DATE_EDEFAULT - .equals(notUnsettableDate); + return NOT_UNSETTABLE_DATE_EDEFAULT == null ? notUnsettableDate != null + : !NOT_UNSETTABLE_DATE_EDEFAULT.equals(notUnsettableDate); case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE: return notUnsettableDouble != NOT_UNSETTABLE_DOUBLE_EDEFAULT; case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT: @@ -688,8 +712,8 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT: return notUnsettableShort != NOT_UNSETTABLE_SHORT_EDEFAULT; case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING: - return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null : !NOT_UNSETTABLE_STRING_EDEFAULT - .equals(notUnsettableString); + return NOT_UNSETTABLE_STRING_EDEFAULT == null ? notUnsettableString != null + : !NOT_UNSETTABLE_STRING_EDEFAULT.equals(notUnsettableString); case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT: return notUnsettableVAT != NOT_UNSETTABLE_VAT_EDEFAULT; } @@ -704,7 +728,9 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (notUnsettableBoolean: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java index 3dd1f6b7fd..f56482be8c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/PersistentContainmentImpl.java @@ -129,8 +129,10 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent String oldAttrBefore = attrBefore; attrBefore = newAttrBefore; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_BEFORE, oldAttrBefore, attrBefore)); + } } /** @@ -165,8 +167,10 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent String oldAttrAfter = attrAfter; attrAfter = newAttrAfter; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.PERSISTENT_CONTAINMENT__ATTR_AFTER, oldAttrAfter, attrAfter)); + } } /** @@ -292,7 +296,9 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (attrBefore: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java index 0f19638872..a9845a17cf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/SpecialPurchaseOrderImpl.java @@ -59,7 +59,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci /** * The cached value of the '{@link #getShippingAddress() <em>Shipping Address</em>}' containment reference. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getShippingAddress() * @generated * @ordered @@ -103,8 +103,10 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci String oldDiscountCode = discountCode; discountCode = newDiscountCode; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, oldDiscountCode, discountCode)); + } } /** @@ -129,9 +131,13 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, oldShippingAddress, newShippingAddress); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -146,18 +152,26 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci { NotificationChain msgs = null; if (shippingAddress != null) - msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs); + { + msgs = ((InternalEObject)shippingAddress).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs); + } if (newShippingAddress != null) - msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs); + { + msgs = ((InternalEObject)newShippingAddress).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE - Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, null, msgs); + } msgs = basicSetShippingAddress(newShippingAddress, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, newShippingAddress, newShippingAddress)); + } } /** @@ -255,7 +269,9 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (discountCode: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java index c0b31aa265..f61f9931a1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressContainmentMapImpl.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 * @@ -43,7 +43,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba /** * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -53,7 +53,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -107,8 +107,10 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY, oldKey, key)); + } } /** @@ -133,9 +135,13 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, oldValue, newValue); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -150,18 +156,26 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba { NotificationChain msgs = null; if (value != null) - msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs); + { + msgs = ((InternalEObject)value).eInverseRemove(this, + EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs); + } if (newValue != null) - msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs); + { + msgs = ((InternalEObject)newValue).eInverseAdd(this, + EOPPOSITE_FEATURE_BASE - Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, null, msgs); + } msgs = basicSetTypedValue(newValue, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, newValue, newValue)); + } } /** @@ -259,7 +273,9 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -283,7 +299,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java index 905587867f..8b1164f4d8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToAddressReferenceMapImpl.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 * @@ -42,7 +42,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi /** * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -52,7 +52,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -106,8 +106,10 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, oldKey, key)); + } } /** @@ -123,8 +125,10 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi if (value != oldValue) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value)); + } } } return value; @@ -148,8 +152,10 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi Address oldValue = value; value = newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, oldValue, value)); + } } /** @@ -165,7 +171,9 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi return getTypedKey(); case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE: if (resolve) + { return getTypedValue(); + } return basicGetTypedValue(); } return super.eGet(featureID, resolve, coreType); @@ -234,7 +242,9 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -258,7 +268,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java index 519b1a8316..fd32f98636 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToStringMapImpl.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 class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr /** * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -50,7 +50,7 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -114,7 +114,9 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__KEY, oldKey, key)); + } } /** @@ -135,7 +137,10 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr String oldValue = value; value = newValue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_STRING_MAP__VALUE, oldValue, value)); + } } /** @@ -218,7 +223,9 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -244,7 +251,7 @@ public class StringToStringMapImpl extends EObjectImpl 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java index 90d10b0f38..224d9d3569 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/StringToVATMapImpl.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 * @@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <li>{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl#getTypedValue <em>Value</em>}</li> * </ul> * </p> - * + * * @generated */ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<String, VAT> @@ -41,7 +41,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S /** * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -51,7 +51,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S /** * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @see #getTypedKey() * @generated * @ordered @@ -115,7 +115,9 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_VAT_MAP__KEY, oldKey, key)); + } } /** @@ -136,7 +138,9 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S VAT oldValue = value; value = newValue == null ? VALUE_EDEFAULT : newValue; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.STRING_TO_VAT_MAP__VALUE, oldValue, value)); + } } /** @@ -219,7 +223,9 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -245,7 +251,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry<S 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.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java index 928d706f53..e9aadd960b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TaskImpl.java @@ -101,7 +101,9 @@ public class TaskImpl extends EObjectImpl implements Task public TaskContainer getTaskContainer() { if (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER) + { return null; + } return (TaskContainer)eContainer(); } @@ -122,23 +124,33 @@ public class TaskImpl extends EObjectImpl implements Task public void setTaskContainer(TaskContainer newTaskContainer) { if (newTaskContainer != eInternalContainer() - || (eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null)) + || eContainerFeatureID() != Model2Package.TASK__TASK_CONTAINER && newTaskContainer != null) { if (EcoreUtil.isAncestor(this, newTaskContainer)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newTaskContainer != null) + { msgs = ((InternalEObject)newTaskContainer).eInverseAdd(this, Model2Package.TASK_CONTAINER__TASKS, TaskContainer.class, msgs); + } msgs = basicSetTaskContainer(newTaskContainer, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__TASK_CONTAINER, newTaskContainer, newTaskContainer)); + } } /** @@ -159,8 +171,10 @@ public class TaskImpl extends EObjectImpl implements Task String oldDescription = description; description = newDescription; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription, - description)); + { + eNotify( + new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DESCRIPTION, oldDescription, description)); + } } /** @@ -181,7 +195,9 @@ public class TaskImpl extends EObjectImpl implements Task boolean oldDone = done; done = newDone; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TASK__DONE, oldDone, done)); + } } /** @@ -195,7 +211,9 @@ public class TaskImpl extends EObjectImpl implements Task { case Model2Package.TASK__TASK_CONTAINER: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetTaskContainer((TaskContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -321,7 +339,9 @@ public class TaskImpl extends EObjectImpl implements Task public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (description: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java index 0bceba1fb4..489c69e913 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/TransientContainerImpl.java @@ -115,8 +115,10 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont String oldAttrBefore = attrBefore; attrBefore = newAttrBefore; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_BEFORE, oldAttrBefore, attrBefore)); + } } /** @@ -126,7 +128,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont public PersistentContainment getParent() { if (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT) + { return null; + } return (PersistentContainment)eContainer(); } @@ -147,23 +151,33 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont public void setParent(PersistentContainment newParent) { if (newParent != eInternalContainer() - || (eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null)) + || eContainerFeatureID() != Model2Package.TRANSIENT_CONTAINER__PARENT && newParent != null) { if (EcoreUtil.isAncestor(this, newParent)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newParent != null) + { msgs = ((InternalEObject)newParent).eInverseAdd(this, Model2Package.PERSISTENT_CONTAINMENT__CHILDREN, PersistentContainment.class, msgs); + } msgs = basicSetParent(newParent, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__PARENT, newParent, newParent)); + } } /** @@ -184,8 +198,10 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont String oldAttrAfter = attrAfter; attrAfter = newAttrAfter; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER, - oldAttrAfter, attrAfter)); + { + eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.TRANSIENT_CONTAINER__ATTR_AFTER, oldAttrAfter, + attrAfter)); + } } /** @@ -199,7 +215,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont { case Model2Package.TRANSIENT_CONTAINER__PARENT: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetParent((PersistentContainment)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -326,7 +344,9 @@ public class TransientContainerImpl extends EObjectImpl implements TransientCont public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (attrBefore: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java index fe5b228e67..9906ba5b73 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable1Impl.java @@ -47,7 +47,7 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 /** * The default value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isUnsettableBoolean() * @generated * @ordered @@ -391,8 +391,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableBooleanESet = unsettableBooleanESet; unsettableBooleanESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet)); + } } /** @@ -406,8 +408,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT; unsettableBooleanESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet)); + } } /** @@ -439,8 +443,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableByteESet = unsettableByteESet; unsettableByteESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE, oldUnsettableByte, unsettableByte, !oldUnsettableByteESet)); + } } /** @@ -454,8 +460,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableByte = UNSETTABLE_BYTE_EDEFAULT; unsettableByteESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_BYTE, oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet)); + } } /** @@ -487,8 +495,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableCharESet = unsettableCharESet; unsettableCharESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR, oldUnsettableChar, unsettableChar, !oldUnsettableCharESet)); + } } /** @@ -502,8 +512,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableChar = UNSETTABLE_CHAR_EDEFAULT; unsettableCharESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_CHAR, oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet)); + } } /** @@ -535,8 +547,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableDateESet = unsettableDateESet; unsettableDateESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE, oldUnsettableDate, unsettableDate, !oldUnsettableDateESet)); + } } /** @@ -550,8 +564,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableDate = UNSETTABLE_DATE_EDEFAULT; unsettableDateESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DATE, oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet)); + } } /** @@ -583,8 +599,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableDoubleESet = unsettableDoubleESet; unsettableDoubleESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE, oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet)); + } } /** @@ -598,8 +616,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT; unsettableDoubleESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet)); + } } /** @@ -631,8 +651,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableFloatESet = unsettableFloatESet; unsettableFloatESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT, oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet)); + } } /** @@ -646,8 +668,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT; unsettableFloatESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_FLOAT, oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet)); + } } /** @@ -679,8 +703,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableIntESet = unsettableIntESet; unsettableIntESet = true; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, - oldUnsettableInt, unsettableInt, !oldUnsettableIntESet)); + { + eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt, + unsettableInt, !oldUnsettableIntESet)); + } } /** @@ -694,8 +720,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableInt = UNSETTABLE_INT_EDEFAULT; unsettableIntESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_INT, oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet)); + } } /** @@ -727,8 +755,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableLongESet = unsettableLongESet; unsettableLongESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG, oldUnsettableLong, unsettableLong, !oldUnsettableLongESet)); + } } /** @@ -742,8 +772,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableLong = UNSETTABLE_LONG_EDEFAULT; unsettableLongESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_LONG, oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet)); + } } /** @@ -775,8 +807,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableShortESet = unsettableShortESet; unsettableShortESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT, oldUnsettableShort, unsettableShort, !oldUnsettableShortESet)); + } } /** @@ -790,8 +824,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableShort = UNSETTABLE_SHORT_EDEFAULT; unsettableShortESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_SHORT, oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet)); + } } /** @@ -823,8 +859,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableStringESet = unsettableStringESet; unsettableStringESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING, oldUnsettableString, unsettableString, !oldUnsettableStringESet)); + } } /** @@ -838,8 +876,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableString = UNSETTABLE_STRING_EDEFAULT; unsettableStringESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet)); + } } /** @@ -871,8 +911,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 boolean oldUnsettableVATESet = unsettableVATESet; unsettableVATESet = true; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, - oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet)); + { + eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT, + unsettableVAT, !oldUnsettableVATESet)); + } } /** @@ -886,8 +928,10 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 unsettableVAT = UNSETTABLE_VAT_EDEFAULT; unsettableVATESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE1__UNSETTABLE_VAT, oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet)); + } } /** @@ -1069,64 +1113,110 @@ public class Unsettable1Impl extends EObjectImpl implements Unsettable1 public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (unsettableBoolean: "); if (unsettableBooleanESet) + { result.append(unsettableBoolean); + } else + { result.append("<unset>"); + } result.append(", unsettableByte: "); if (unsettableByteESet) + { result.append(unsettableByte); + } else + { result.append("<unset>"); + } result.append(", unsettableChar: "); if (unsettableCharESet) + { result.append(unsettableChar); + } else + { result.append("<unset>"); + } result.append(", unsettableDate: "); if (unsettableDateESet) + { result.append(unsettableDate); + } else + { result.append("<unset>"); + } result.append(", unsettableDouble: "); if (unsettableDoubleESet) + { result.append(unsettableDouble); + } else + { result.append("<unset>"); + } result.append(", unsettableFloat: "); if (unsettableFloatESet) + { result.append(unsettableFloat); + } else + { result.append("<unset>"); + } result.append(", unsettableInt: "); if (unsettableIntESet) + { result.append(unsettableInt); + } else + { result.append("<unset>"); + } result.append(", unsettableLong: "); if (unsettableLongESet) + { result.append(unsettableLong); + } else + { result.append("<unset>"); + } result.append(", unsettableShort: "); if (unsettableShortESet) + { result.append(unsettableShort); + } else + { result.append("<unset>"); + } result.append(", unsettableString: "); if (unsettableStringESet) + { result.append(unsettableString); + } else + { result.append("<unset>"); + } result.append(", unsettableVAT: "); if (unsettableVATESet) + { result.append(unsettableVAT); + } else + { result.append("<unset>"); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java index 31821f9e32..639b7e5c44 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/impl/Unsettable2WithDefaultImpl.java @@ -50,7 +50,7 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl /** * The default value of the '{@link #isUnsettableBoolean() <em>Unsettable Boolean</em>}' attribute. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #isUnsettableBoolean() * @generated * @ordered @@ -139,8 +139,8 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl * @generated * @ordered */ - protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE.createFromString( - EcorePackage.eINSTANCE.getEDate(), "2009-12-21T15:12:59"); + protected static final Date UNSETTABLE_DATE_EDEFAULT = (Date)EcoreFactory.eINSTANCE + .createFromString(EcorePackage.eINSTANCE.getEDate(), "2009-12-21T15:12:59"); /** * The cached value of the '{@link #getUnsettableDate() <em>Unsettable Date</em>}' attribute. @@ -395,8 +395,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableBooleanESet = unsettableBooleanESet; unsettableBooleanESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, unsettableBoolean, !oldUnsettableBooleanESet)); + } } /** @@ -410,9 +412,11 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableBoolean = UNSETTABLE_BOOLEAN_EDEFAULT; unsettableBooleanESet = false; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, - Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, oldUnsettableBoolean, - UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet)); + { + eNotify( + new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, + oldUnsettableBoolean, UNSETTABLE_BOOLEAN_EDEFAULT, oldUnsettableBooleanESet)); + } } /** @@ -444,8 +448,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableByteESet = unsettableByteESet; unsettableByteESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, oldUnsettableByte, unsettableByte, !oldUnsettableByteESet)); + } } /** @@ -459,8 +465,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableByte = UNSETTABLE_BYTE_EDEFAULT; unsettableByteESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, oldUnsettableByte, UNSETTABLE_BYTE_EDEFAULT, oldUnsettableByteESet)); + } } /** @@ -492,8 +500,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableCharESet = unsettableCharESet; unsettableCharESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, oldUnsettableChar, unsettableChar, !oldUnsettableCharESet)); + } } /** @@ -507,8 +517,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableChar = UNSETTABLE_CHAR_EDEFAULT; unsettableCharESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, oldUnsettableChar, UNSETTABLE_CHAR_EDEFAULT, oldUnsettableCharESet)); + } } /** @@ -540,8 +552,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableDateESet = unsettableDateESet; unsettableDateESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, oldUnsettableDate, unsettableDate, !oldUnsettableDateESet)); + } } /** @@ -555,8 +569,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableDate = UNSETTABLE_DATE_EDEFAULT; unsettableDateESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, oldUnsettableDate, UNSETTABLE_DATE_EDEFAULT, oldUnsettableDateESet)); + } } /** @@ -588,8 +604,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableDoubleESet = unsettableDoubleESet; unsettableDoubleESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, unsettableDouble, !oldUnsettableDoubleESet)); + } } /** @@ -603,9 +621,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableDouble = UNSETTABLE_DOUBLE_EDEFAULT; unsettableDoubleESet = false; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, - Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, - oldUnsettableDoubleESet)); + { + eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, + oldUnsettableDouble, UNSETTABLE_DOUBLE_EDEFAULT, oldUnsettableDoubleESet)); + } } /** @@ -637,8 +656,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableFloatESet = unsettableFloatESet; unsettableFloatESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, oldUnsettableFloat, unsettableFloat, !oldUnsettableFloatESet)); + } } /** @@ -652,8 +673,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableFloat = UNSETTABLE_FLOAT_EDEFAULT; unsettableFloatESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, oldUnsettableFloat, UNSETTABLE_FLOAT_EDEFAULT, oldUnsettableFloatESet)); + } } /** @@ -685,8 +708,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableIntESet = unsettableIntESet; unsettableIntESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, oldUnsettableInt, unsettableInt, !oldUnsettableIntESet)); + } } /** @@ -700,8 +725,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableInt = UNSETTABLE_INT_EDEFAULT; unsettableIntESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, oldUnsettableInt, UNSETTABLE_INT_EDEFAULT, oldUnsettableIntESet)); + } } /** @@ -733,8 +760,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableLongESet = unsettableLongESet; unsettableLongESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, oldUnsettableLong, unsettableLong, !oldUnsettableLongESet)); + } } /** @@ -748,8 +777,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableLong = UNSETTABLE_LONG_EDEFAULT; unsettableLongESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, oldUnsettableLong, UNSETTABLE_LONG_EDEFAULT, oldUnsettableLongESet)); + } } /** @@ -781,8 +812,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableShortESet = unsettableShortESet; unsettableShortESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, oldUnsettableShort, unsettableShort, !oldUnsettableShortESet)); + } } /** @@ -796,8 +829,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableShort = UNSETTABLE_SHORT_EDEFAULT; unsettableShortESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, oldUnsettableShort, UNSETTABLE_SHORT_EDEFAULT, oldUnsettableShortESet)); + } } /** @@ -829,8 +864,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableStringESet = unsettableStringESet; unsettableStringESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, unsettableString, !oldUnsettableStringESet)); + } } /** @@ -844,9 +881,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableString = UNSETTABLE_STRING_EDEFAULT; unsettableStringESet = false; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, - Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, - oldUnsettableStringESet)); + { + eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, + oldUnsettableString, UNSETTABLE_STRING_EDEFAULT, oldUnsettableStringESet)); + } } /** @@ -878,8 +916,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl boolean oldUnsettableVATESet = unsettableVATESet; unsettableVATESet = true; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, oldUnsettableVAT, unsettableVAT, !oldUnsettableVATESet)); + } } /** @@ -893,8 +933,10 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl unsettableVAT = UNSETTABLE_VAT_EDEFAULT; unsettableVATESet = false; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.UNSET, Model2Package.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, oldUnsettableVAT, UNSETTABLE_VAT_EDEFAULT, oldUnsettableVATESet)); + } } /** @@ -1076,64 +1118,110 @@ public class Unsettable2WithDefaultImpl extends EObjectImpl implements Unsettabl public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (unsettableBoolean: "); if (unsettableBooleanESet) + { result.append(unsettableBoolean); + } else + { result.append("<unset>"); + } result.append(", unsettableByte: "); if (unsettableByteESet) + { result.append(unsettableByte); + } else + { result.append("<unset>"); + } result.append(", unsettableChar: "); if (unsettableCharESet) + { result.append(unsettableChar); + } else + { result.append("<unset>"); + } result.append(", unsettableDate: "); if (unsettableDateESet) + { result.append(unsettableDate); + } else + { result.append("<unset>"); + } result.append(", unsettableDouble: "); if (unsettableDoubleESet) + { result.append(unsettableDouble); + } else + { result.append("<unset>"); + } result.append(", unsettableFloat: "); if (unsettableFloatESet) + { result.append(unsettableFloat); + } else + { result.append("<unset>"); + } result.append(", unsettableInt: "); if (unsettableIntESet) + { result.append(unsettableInt); + } else + { result.append("<unset>"); + } result.append(", unsettableLong: "); if (unsettableLongESet) + { result.append(unsettableLong); + } else + { result.append("<unset>"); + } result.append(", unsettableShort: "); if (unsettableShortESet) + { result.append(unsettableShort); + } else + { result.append("<unset>"); + } result.append(", unsettableString: "); if (unsettableStringESet) + { result.append(unsettableString); + } else + { result.append("<unset>"); + } result.append(", unsettableVAT: "); if (unsettableVATESet) + { result.append(unsettableVAT); + } else + { result.append("<unset>"); + } result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java index 0877cf60b6..a95a6fc885 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/legacy/util/Model2Switch.java @@ -103,11 +103,17 @@ public class Model2Switch<T> extends Switch<T> SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject; T result = caseSpecialPurchaseOrder(specialPurchaseOrder); if (result == null) + { result = casePurchaseOrder(specialPurchaseOrder); + } if (result == null) + { result = caseOrder(specialPurchaseOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK_CONTAINER: @@ -115,7 +121,9 @@ public class Model2Switch<T> extends Switch<T> TaskContainer taskContainer = (TaskContainer)theEObject; T result = caseTaskContainer(taskContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK: @@ -123,7 +131,9 @@ public class Model2Switch<T> extends Switch<T> Task task = (Task)theEObject; T result = caseTask(task); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE1: @@ -131,7 +141,9 @@ public class Model2Switch<T> extends Switch<T> Unsettable1 unsettable1 = (Unsettable1)theEObject; T result = caseUnsettable1(unsettable1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE2_WITH_DEFAULT: @@ -139,7 +151,9 @@ public class Model2Switch<T> extends Switch<T> Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject; T result = caseUnsettable2WithDefault(unsettable2WithDefault); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.PERSISTENT_CONTAINMENT: @@ -147,7 +161,9 @@ public class Model2Switch<T> extends Switch<T> PersistentContainment persistentContainment = (PersistentContainment)theEObject; T result = casePersistentContainment(persistentContainment); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TRANSIENT_CONTAINER: @@ -155,7 +171,9 @@ public class Model2Switch<T> extends Switch<T> TransientContainer transientContainer = (TransientContainer)theEObject; T result = caseTransientContainer(transientContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.NOT_UNSETTABLE: @@ -163,7 +181,9 @@ public class Model2Switch<T> extends Switch<T> NotUnsettable notUnsettable = (NotUnsettable)theEObject; T result = caseNotUnsettable(notUnsettable); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT: @@ -171,7 +191,9 @@ public class Model2Switch<T> extends Switch<T> NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject; T result = caseNotUnsettableWithDefault(notUnsettableWithDefault); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.MAP_HOLDER: @@ -179,7 +201,9 @@ public class Model2Switch<T> extends Switch<T> MapHolder mapHolder = (MapHolder)theEObject; T result = caseMapHolder(mapHolder); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_STRING_MAP: @@ -188,7 +212,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject; T result = caseStringToStringMap(stringToStringMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.INTEGER_TO_STRING_MAP: @@ -197,7 +223,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject; T result = caseIntegerToStringMap(integerToStringMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_VAT_MAP: @@ -206,7 +234,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject; T result = caseStringToVATMap(stringToVATMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP: @@ -215,7 +245,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject; T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP: @@ -224,7 +256,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject; T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_MAP: @@ -233,7 +267,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectMap(eObjectToEObjectMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP: @@ -242,7 +278,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP: @@ -251,7 +289,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP: @@ -260,7 +300,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.ENUM_LIST_HOLDER: @@ -268,7 +310,9 @@ public class Model2Switch<T> extends Switch<T> EnumListHolder enumListHolder = (EnumListHolder)theEObject; T result = caseEnumListHolder(enumListHolder); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java index 3fe3e33a18..b07c089892 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/util/Model2Switch.java @@ -95,11 +95,17 @@ public class Model2Switch<T> extends Switch<T> SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject; T result = caseSpecialPurchaseOrder(specialPurchaseOrder); if (result == null) + { result = casePurchaseOrder(specialPurchaseOrder); + } if (result == null) + { result = caseOrder(specialPurchaseOrder); + } if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK_CONTAINER: @@ -107,7 +113,9 @@ public class Model2Switch<T> extends Switch<T> TaskContainer taskContainer = (TaskContainer)theEObject; T result = caseTaskContainer(taskContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TASK: @@ -115,7 +123,9 @@ public class Model2Switch<T> extends Switch<T> Task task = (Task)theEObject; T result = caseTask(task); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE1: @@ -123,7 +133,9 @@ public class Model2Switch<T> extends Switch<T> Unsettable1 unsettable1 = (Unsettable1)theEObject; T result = caseUnsettable1(unsettable1); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.UNSETTABLE2_WITH_DEFAULT: @@ -131,7 +143,9 @@ public class Model2Switch<T> extends Switch<T> Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject; T result = caseUnsettable2WithDefault(unsettable2WithDefault); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.PERSISTENT_CONTAINMENT: @@ -139,7 +153,9 @@ public class Model2Switch<T> extends Switch<T> PersistentContainment persistentContainment = (PersistentContainment)theEObject; T result = casePersistentContainment(persistentContainment); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.TRANSIENT_CONTAINER: @@ -147,7 +163,9 @@ public class Model2Switch<T> extends Switch<T> TransientContainer transientContainer = (TransientContainer)theEObject; T result = caseTransientContainer(transientContainer); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.NOT_UNSETTABLE: @@ -155,7 +173,9 @@ public class Model2Switch<T> extends Switch<T> NotUnsettable notUnsettable = (NotUnsettable)theEObject; T result = caseNotUnsettable(notUnsettable); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT: @@ -163,7 +183,9 @@ public class Model2Switch<T> extends Switch<T> NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject; T result = caseNotUnsettableWithDefault(notUnsettableWithDefault); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.MAP_HOLDER: @@ -171,7 +193,9 @@ public class Model2Switch<T> extends Switch<T> MapHolder mapHolder = (MapHolder)theEObject; T result = caseMapHolder(mapHolder); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_STRING_MAP: @@ -180,7 +204,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject; T result = caseStringToStringMap(stringToStringMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.INTEGER_TO_STRING_MAP: @@ -189,7 +215,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject; T result = caseIntegerToStringMap(integerToStringMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_VAT_MAP: @@ -198,7 +226,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject; T result = caseStringToVATMap(stringToVATMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP: @@ -207,7 +237,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject; T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP: @@ -216,7 +248,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject; T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_MAP: @@ -225,7 +259,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectMap(eObjectToEObjectMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP: @@ -234,7 +270,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP: @@ -243,7 +281,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP: @@ -252,7 +292,9 @@ public class Model2Switch<T> extends Switch<T> Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject; T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap); if (result == null) + { result = defaultCase(theEObject); + } return result; } case Model2Package.ENUM_LIST_HOLDER: @@ -260,7 +302,9 @@ public class Model2Switch<T> extends Switch<T> EnumListHolder enumListHolder = (EnumListHolder)theEObject; T result = caseEnumListHolder(enumListHolder); if (result == null) + { result = defaultCase(theEObject); + } return result; } default: |