diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3')
10 files changed, 197 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore index 12dc6cd66d..4a62aee647 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore @@ -5,6 +5,7 @@ <eClassifiers xsi:type="ecore:EClass" name="Class1"> <eStructuralFeatures xsi:type="ecore:EReference" name="class2" upperBound="-1" eType="#//subpackage/Class2" unsettable="true" eOpposite="#//subpackage/Class2/class1"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionalValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="MetaRef"> <eStructuralFeatures xsi:type="ecore:EReference" name="ePackageRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/> diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel index 12a92afb53..4f77bb46da 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel @@ -14,6 +14,7 @@ <genDataTypes ecoreDataType="model3.ecore#//Point"/> <genClasses ecoreClass="model3.ecore#//Class1"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Class1/additionalValue"/> </genClasses> <genClasses ecoreClass="model3.ecore#//MetaRef"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/> diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel index ae53d2d671..e81768cf17 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.legacy.genmodel @@ -13,6 +13,7 @@ <genDataTypes ecoreDataType="model3.ecore#//Point"/> <genClasses ecoreClass="model3.ecore#//Class1"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//Class1/additionalValue"/> </genClasses> <genClasses ecoreClass="model3.ecore#//MetaRef"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/> diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java index c78d017fd4..dde95fb2d7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Class1.java @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject; * </p> * <ul> * <li>{@link org.eclipse.emf.cdo.tests.model3.Class1#getClass2 <em>Class2</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.Class1#getAdditionalValue <em>Additional Value</em>}</li> * </ul> * * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1() @@ -70,4 +71,30 @@ public interface Class1 extends EObject */ boolean isSetClass2(); + /** + * Returns the value of the '<em><b>Additional Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Additional Value</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Additional Value</em>' attribute. + * @see #setAdditionalValue(String) + * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getClass1_AdditionalValue() + * @model + * @generated + */ + String getAdditionalValue(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.Class1#getAdditionalValue <em>Additional Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Additional Value</em>' attribute. + * @see #getAdditionalValue() + * @generated + */ + void setAdditionalValue(String value); + } // Class1 diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java index ea98a0e6d0..f6557fda1f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java @@ -78,12 +78,21 @@ public interface Model3Package extends EPackage int CLASS1__CLASS2 = 0; /** + * The feature id for the '<em><b>Additional Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS1__ADDITIONAL_VALUE = 1; + + /** * The number of structural features of the '<em>Class1</em>' class. * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ - int CLASS1_FEATURE_COUNT = 1; + int CLASS1_FEATURE_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl <em>Meta Ref</em>}' class. @@ -829,6 +838,17 @@ public interface Model3Package extends EPackage EReference getClass1_Class2(); /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.Class1#getAdditionalValue <em>Additional Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Additional Value</em>'. + * @see org.eclipse.emf.cdo.tests.model3.Class1#getAdditionalValue() + * @see #getClass1() + * @generated + */ + EAttribute getClass1_AdditionalValue(); + + /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.MetaRef <em>Meta Ref</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java index 680acd526c..107bbe75a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java @@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.EClass; * </p> * <ul> * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl#getClass2 <em>Class2</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.Class1Impl#getAdditionalValue <em>Additional Value</em>}</li> * </ul> * * @generated @@ -89,4 +90,24 @@ public class Class1Impl extends CDOObjectImpl implements Class1 return eIsSet(Model3Package.eINSTANCE.getClass1_Class2()); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getAdditionalValue() + { + return (String)eGet(Model3Package.eINSTANCE.getClass1_AdditionalValue(), true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setAdditionalValue(String newAdditionalValue) + { + eSet(Model3Package.eINSTANCE.getClass1_AdditionalValue(), newAdditionalValue); + } + } // Class1Impl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java index a2f6aaa205..8d61db0444 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java @@ -273,6 +273,16 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClass1_AdditionalValue() + { + return (EAttribute)class1EClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @@ -886,6 +896,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package // Create classes and their features class1EClass = createEClass(CLASS1); createEReference(class1EClass, CLASS1__CLASS2); + createEAttribute(class1EClass, CLASS1__ADDITIONAL_VALUE); metaRefEClass = createEClass(META_REF); createEReference(metaRefEClass, META_REF__EPACKAGE_REF); @@ -1014,6 +1025,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package initEClass(class1EClass, Class1.class, "Class1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(), "class2", null, 0, -1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getClass1_AdditionalValue(), ecorePackage.getEString(), "additionalValue", null, 0, 1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(metaRefEClass, MetaRef.class, "MetaRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE, diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/Model3Package.java index 091ab63659..2b219c5de2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/Model3Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/Model3Package.java @@ -78,12 +78,21 @@ public interface Model3Package extends EPackage, org.eclipse.emf.cdo.tests.model int CLASS1__CLASS2 = 0; /** + * The feature id for the '<em><b>Additional Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CLASS1__ADDITIONAL_VALUE = 1; + + /** * The number of structural features of the '<em>Class1</em>' class. * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ - int CLASS1_FEATURE_COUNT = 1; + int CLASS1_FEATURE_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.MetaRefImpl <em>Meta Ref</em>}' class. @@ -822,6 +831,17 @@ public interface Model3Package extends EPackage, org.eclipse.emf.cdo.tests.model EReference getClass1_Class2(); /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model3.Class1#getAdditionalValue <em>Additional Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Additional Value</em>'. + * @see org.eclipse.emf.cdo.tests.model3.Class1#getAdditionalValue() + * @see #getClass1() + * @generated + */ + EAttribute getClass1_AdditionalValue(); + + /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef <em>Meta Ref</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java index 8bd89ad786..4f0046d721 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Class1Impl.java @@ -15,10 +15,12 @@ import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package; import org.eclipse.emf.cdo.tests.model3.subpackage.Class2; import org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -32,6 +34,7 @@ import java.util.Collection; * </p> * <ul> * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.Class1Impl#getClass2 <em>Class2</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model3.legacy.impl.Class1Impl#getAdditionalValue <em>Additional Value</em>}</li> * </ul> * * @generated @@ -49,6 +52,26 @@ public class Class1Impl extends EObjectImpl implements Class1 protected EList<Class2> class2; /** + * The default value of the '{@link #getAdditionalValue() <em>Additional Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAdditionalValue() + * @generated + * @ordered + */ + protected static final String ADDITIONAL_VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAdditionalValue() <em>Additional Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAdditionalValue() + * @generated + * @ordered + */ + protected String additionalValue = ADDITIONAL_VALUE_EDEFAULT; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @@ -103,6 +126,31 @@ public class Class1Impl extends EObjectImpl implements Class1 } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getAdditionalValue() + { + return additionalValue; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setAdditionalValue(String newAdditionalValue) + { + String oldAdditionalValue = additionalValue; + additionalValue = newAdditionalValue; + if (eNotificationRequired()) + { + eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.CLASS1__ADDITIONAL_VALUE, oldAdditionalValue, additionalValue)); + } + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @@ -144,6 +192,8 @@ public class Class1Impl extends EObjectImpl implements Class1 { case Model3Package.CLASS1__CLASS2: return getClass2(); + case Model3Package.CLASS1__ADDITIONAL_VALUE: + return getAdditionalValue(); } return super.eGet(featureID, resolve, coreType); } @@ -162,6 +212,9 @@ public class Class1Impl extends EObjectImpl implements Class1 getClass2().clear(); getClass2().addAll((Collection<? extends Class2>)newValue); return; + case Model3Package.CLASS1__ADDITIONAL_VALUE: + setAdditionalValue((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -178,6 +231,9 @@ public class Class1Impl extends EObjectImpl implements Class1 case Model3Package.CLASS1__CLASS2: unsetClass2(); return; + case Model3Package.CLASS1__ADDITIONAL_VALUE: + setAdditionalValue(ADDITIONAL_VALUE_EDEFAULT); + return; } super.eUnset(featureID); } @@ -193,8 +249,30 @@ public class Class1Impl extends EObjectImpl implements Class1 { case Model3Package.CLASS1__CLASS2: return isSetClass2(); + case Model3Package.CLASS1__ADDITIONAL_VALUE: + return ADDITIONAL_VALUE_EDEFAULT == null ? additionalValue != null : !ADDITIONAL_VALUE_EDEFAULT.equals(additionalValue); } return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) + { + return super.toString(); + } + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (additionalValue: "); + result.append(additionalValue); + result.append(')'); + return result.toString(); + } + } // Class1Impl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java index 1504500101..71bf58e07a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java @@ -273,6 +273,16 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getClass1_AdditionalValue() + { + return (EAttribute)class1EClass.getEStructuralFeatures().get(1); + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ @@ -886,6 +896,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package // Create classes and their features class1EClass = createEClass(CLASS1); createEReference(class1EClass, CLASS1__CLASS2); + createEAttribute(class1EClass, CLASS1__ADDITIONAL_VALUE); metaRefEClass = createEClass(META_REF); createEReference(metaRefEClass, META_REF__EPACKAGE_REF); @@ -1014,6 +1025,8 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package initEClass(class1EClass, Class1.class, "Class1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getClass1_Class2(), theSubpackagePackage.getClass2(), theSubpackagePackage.getClass2_Class1(), "class2", null, 0, -1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getClass1_AdditionalValue(), ecorePackage.getEString(), "additionalValue", null, 0, 1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, + IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(metaRefEClass, MetaRef.class, "MetaRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1, MetaRef.class, !IS_TRANSIENT, !IS_VOLATILE, |