diff options
30 files changed, 1487 insertions, 483 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel index 273f012c9d..421725679b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel +++ b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel @@ -395,8 +395,8 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlGenerator_2_0/description"/> </genClasses> <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlManyToMany_2_0"/> - <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer2_0"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer2_0/mapKeyAttributeOverrides"/> + <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer_2_0"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer_2_0/mapKeyAttributeOverrides"/> </genClasses> <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyClass_2_0"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapKeyClass_2_0/className"/> diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore index a06d2c2971..9f2dc9ef9f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore +++ b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore @@ -451,7 +451,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true" - interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlMapKeyAttributeOverrideContainer2_0"> + interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlMapKeyAttributeOverrideContainer_2_0"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"/> <eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey" @@ -487,7 +487,7 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true" interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAttributeOverrideContainer2_0" + <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAttributeOverrideContainer_2_0" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAttributeOverrides" upperBound="-1" eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/> @@ -501,7 +501,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapsId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlMultiRelationshipMapping_2_0" abstract="true" - interface="true" eSuperTypes="#//v2_0/XmlOrderable_2_0 #//v2_0/XmlMapKeyAttributeOverrideContainer2_0"> + interface="true" eSuperTypes="#//v2_0/XmlOrderable_2_0 #//v2_0/XmlMapKeyAttributeOverrideContainer_2_0"> <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlMapKeyClass" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyTemporal" eType="#//TemporalType"/> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/GenericJpaProjectManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/GenericJpaProjectManager.java index e8bef3c898..f530077070 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/GenericJpaProjectManager.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/GenericJpaProjectManager.java @@ -152,7 +152,9 @@ class GenericJpaProjectManager */ private static final int RESOURCE_CHANGE_EVENT_TYPES = IResourceChangeEvent.POST_CHANGE | - IResourceChangeEvent.POST_BUILD; + IResourceChangeEvent.POST_BUILD | + IResourceChangeEvent.PRE_DELETE | + IResourceChangeEvent.PRE_CLOSE; /** * Listen for the JPA facet being added to or removed from a "faceted" project. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java index 8c7b1771e7..3a9711562a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package; -import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0; +import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0; import org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0; import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrderable_2_0; import org.eclipse.jpt.core.utility.TextRange; @@ -397,7 +397,7 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides() * @model containment="true" * @generated */ @@ -924,11 +924,11 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel default: return -1; } } - if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class) + if (baseClass == XmlMapKeyAttributeOverrideContainer_2_0.class) { switch (derivedFeatureID) { - case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES; + case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES; default: return -1; } } @@ -987,11 +987,11 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel default: return -1; } } - if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class) + if (baseClass == XmlMapKeyAttributeOverrideContainer_2_0.class) { switch (baseFeatureID) { - case OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES; + case OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES; default: return -1; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java index 8a5e6b22c1..7d74ddab82 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java @@ -28,7 +28,7 @@ import org.eclipse.jpt.core.jpa2.MappingKeys2_0; import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0; import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package; import org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0; -import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0; +import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0; import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrderable_2_0; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -581,7 +581,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides() * @model containment="true" * @generated */ @@ -1378,11 +1378,11 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements default: return -1; } } - if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class) + if (baseClass == XmlMapKeyAttributeOverrideContainer_2_0.class) { switch (derivedFeatureID) { - case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES; + case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES; default: return -1; } } @@ -1456,11 +1456,11 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements default: return -1; } } - if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class) + if (baseClass == XmlMapKeyAttributeOverrideContainer_2_0.class) { switch (baseFeatureID) { - case OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES; + case OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES; default: return -1; } } @@ -1629,6 +1629,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements } protected static Translator buildMapKeyAttributeOverrideTranslator() { - return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()); + return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides()); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java index 400789bf42..16051a29fe 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java @@ -105,7 +105,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement } protected static Translator buildMapKeyAttributeOverrideTranslator() { - return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()); + return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides()); } protected static Translator buildMapKeyColumnTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java index 1db9324e43..ff9da773cf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java @@ -391,7 +391,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements } protected static Translator buildMapKeyAttributeOverrideTranslator() { - return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()); + return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides()); } protected static Translator buildMapKeyColumnTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java index 871e4e779d..3e4a8d9468 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java @@ -84,16 +84,6 @@ public class OrmV2_0Package extends EPackageImpl public static final int XML_ATTRIBUTE_MAPPING_20 = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 <em>Xml Map Key Attribute Override Container2 0</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 - * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0() - * @generated - */ - public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0 = 14; - - /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAssociationOverride_2_0 <em>Xml Association Override 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -811,22 +801,32 @@ public class OrmV2_0Package extends EPackageImpl public static final int XML_MANY_TO_MANY_20_FEATURE_COUNT = XML_MULTI_RELATIONSHIP_MAPPING_20_FEATURE_COUNT + 0; /** + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0 <em>Xml Map Key Attribute Override Container 20</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0 + * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer_2_0() + * @generated + */ + public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20 = 14; + + /** * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES = 0; + public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES = 0; /** - * The number of structural features of the '<em>Xml Map Key Attribute Override Container2 0</em>' class. + * The number of structural features of the '<em>Xml Map Key Attribute Override Container 20</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0_FEATURE_COUNT = 1; + public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20_FEATURE_COUNT = 1; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}' class. @@ -1396,13 +1396,6 @@ public class OrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlMapKeyAttributeOverrideContainer2_0EClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass xmlAssociationOverride_2_0EClass = null; /** @@ -1487,6 +1480,13 @@ public class OrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlMapKeyAttributeOverrideContainer_2_0EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlMapKeyClass_2_0EClass = null; /** @@ -1712,35 +1712,6 @@ public class OrmV2_0Package extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 <em>Xml Map Key Attribute Override Container2 0</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Map Key Attribute Override Container2 0</em>'. - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 - * @generated - */ - public EClass getXmlMapKeyAttributeOverrideContainer2_0() - { - return xmlMapKeyAttributeOverrideContainer2_0EClass; - } - - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'. - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0#getMapKeyAttributeOverrides() - * @see #getXmlMapKeyAttributeOverrideContainer2_0() - * @generated - */ - public EReference getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides() - { - return (EReference)xmlMapKeyAttributeOverrideContainer2_0EClass.getEStructuralFeatures().get(0); - } - - - /** * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAssociationOverride_2_0 <em>Xml Association Override 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2194,6 +2165,35 @@ public class OrmV2_0Package extends EPackageImpl /** + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0 <em>Xml Map Key Attribute Override Container 20</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Map Key Attribute Override Container 20</em>'. + * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0 + * @generated + */ + public EClass getXmlMapKeyAttributeOverrideContainer_2_0() + { + return xmlMapKeyAttributeOverrideContainer_2_0EClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'. + * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0#getMapKeyAttributeOverrides() + * @see #getXmlMapKeyAttributeOverrideContainer_2_0() + * @generated + */ + public EReference getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides() + { + return (EReference)xmlMapKeyAttributeOverrideContainer_2_0EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2882,8 +2882,8 @@ public class OrmV2_0Package extends EPackageImpl xmlManyToMany_2_0EClass = createEClass(XML_MANY_TO_MANY_20); - xmlMapKeyAttributeOverrideContainer2_0EClass = createEClass(XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0); - createEReference(xmlMapKeyAttributeOverrideContainer2_0EClass, XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES); + xmlMapKeyAttributeOverrideContainer_2_0EClass = createEClass(XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20); + createEReference(xmlMapKeyAttributeOverrideContainer_2_0EClass, XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES); xmlMapKeyClass_2_0EClass = createEClass(XML_MAP_KEY_CLASS_20); createEAttribute(xmlMapKeyClass_2_0EClass, XML_MAP_KEY_CLASS_20__CLASS_NAME); @@ -2984,12 +2984,12 @@ public class OrmV2_0Package extends EPackageImpl xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlOrderable()); xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAttributeOverrideContainer()); xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer()); - xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAttributeOverrideContainer2_0()); + xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAttributeOverrideContainer_2_0()); xmlEmbedded_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer()); xmlEntity_2_0EClass.getESuperTypes().add(this.getXmlCacheable_2_0()); xmlManyToMany_2_0EClass.getESuperTypes().add(this.getXmlMultiRelationshipMapping_2_0()); xmlMultiRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlOrderable_2_0()); - xmlMultiRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAttributeOverrideContainer2_0()); + xmlMultiRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAttributeOverrideContainer_2_0()); xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlMultiRelationshipMapping_2_0()); xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlOrphanRemovable_2_0()); xmlOneToOne_2_0EClass.getESuperTypes().add(this.getXmlSingleRelationshipMapping_2_0()); @@ -3046,8 +3046,8 @@ public class OrmV2_0Package extends EPackageImpl initEClass(xmlManyToMany_2_0EClass, XmlManyToMany_2_0.class, "XmlManyToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(xmlMapKeyAttributeOverrideContainer2_0EClass, XmlMapKeyAttributeOverrideContainer2_0.class, "XmlMapKeyAttributeOverrideContainer2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides(), theOrmPackage.getXmlAttributeOverride(), null, "mapKeyAttributeOverrides", null, 0, -1, XmlMapKeyAttributeOverrideContainer2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlMapKeyAttributeOverrideContainer_2_0EClass, XmlMapKeyAttributeOverrideContainer_2_0.class, "XmlMapKeyAttributeOverrideContainer_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides(), theOrmPackage.getXmlAttributeOverride(), null, "mapKeyAttributeOverrides", null, 0, -1, XmlMapKeyAttributeOverrideContainer_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlMapKeyClass_2_0EClass, XmlMapKeyClass_2_0.class, "XmlMapKeyClass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlMapKeyClass_2_0_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlMapKeyClass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3142,24 +3142,6 @@ public class OrmV2_0Package extends EPackageImpl public static final EClass XML_ATTRIBUTE_MAPPING_20 = eINSTANCE.getXmlAttributeMapping_2_0(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 <em>Xml Map Key Attribute Override Container2 0</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 - * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0() - * @generated - */ - public static final EClass XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0 = eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0(); - - /** - * The meta object literal for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final EReference XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides(); - - /** * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAssociationOverride_2_0 <em>Xml Association Override 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3432,6 +3414,24 @@ public class OrmV2_0Package extends EPackageImpl public static final EClass XML_MANY_TO_MANY_20 = eINSTANCE.getXmlManyToMany_2_0(); /** + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0 <em>Xml Map Key Attribute Override Container 20</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0 + * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer_2_0() + * @generated + */ + public static final EClass XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20 = eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0(); + + /** + * The meta object literal for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EReference XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java index 0764c86ba6..b682829e82 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java @@ -57,7 +57,7 @@ import org.eclipse.jpt.core.utility.TextRange; * @model kind="class" interface="true" abstract="true" * @generated */ -public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrderable, XmlAttributeOverrideContainer, XmlAssociationOverrideContainer, XmlMapKeyAttributeOverrideContainer2_0 +public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrderable, XmlAttributeOverrideContainer, XmlAssociationOverrideContainer, XmlMapKeyAttributeOverrideContainer_2_0 { /** * Returns the value of the '<em><b>Target Class</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer_2_0.java index 5455fcad80..dc79723228 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer_2_0.java @@ -30,16 +30,16 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0() + * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer_2_0() * @model kind="class" interface="true" abstract="true" * @extends JpaEObject * @generated */ -public interface XmlMapKeyAttributeOverrideContainer2_0 extends JpaEObject +public interface XmlMapKeyAttributeOverrideContainer_2_0 extends JpaEObject { /** * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list. @@ -51,7 +51,7 @@ public interface XmlMapKeyAttributeOverrideContainer2_0 extends JpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java index d66aa63ec3..367825cbea 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java @@ -44,7 +44,7 @@ import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; * @model kind="class" interface="true" abstract="true" * @generated */ -public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0, XmlMapKeyAttributeOverrideContainer2_0 +public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0, XmlMapKeyAttributeOverrideContainer_2_0 { /** * Returns the value of the '<em><b>Map Key Class</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel index 653476b234..56d5a26686 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel @@ -263,20 +263,20 @@ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/READ_WRITE"/> <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_0/OrderCorrectionType_2_0/EXCEPTION"/> </genEnums> - <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlCacheInterceptor2_0"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlCacheInterceptor2_0/className"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlCacheInterceptor_2_0"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlCacheInterceptor_2_0/className"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0/mapKeyConvert"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlElementCollection_2_0"/> - <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlEntity2_0"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity2_0/cacheInterceptor"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity2_0/queryRedirectors"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlEntity_2_0"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity_2_0/cacheInterceptor"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity_2_0/queryRedirectors"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlManyToMany_2_0"/> - <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer2_0"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer2_0/mapKeyAssociationOverrides"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0/mapKeyAssociationOverrides"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0/cacheInterceptor"/> @@ -285,14 +285,14 @@ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlOrderColumn_2_0"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlOrderColumn_2_0/correctionType"/> </genClasses> - <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/allQueries"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/readAll"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/readObject"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/report"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/update"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/insert"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors2_0/delete"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/allQueries"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/readAll"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/readObject"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/report"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/update"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/insert"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlQueryRedirectors_2_0/delete"/> </genClasses> </nestedGenPackages> </genPackages> diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore index 5a0fa3d9c3..3d6f29a413 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore @@ -46,7 +46,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="existenceChecking" eType="#//ExistenceType" defaultValueLiteral=""/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlCacheInterceptor" eSuperTypes="#//v2_0/XmlCacheInterceptor2_0"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlCacheInterceptor" eSuperTypes="#//v2_0/XmlCacheInterceptor_2_0"/> <eClassifiers xsi:type="ecore:EClass" name="XmlChangeTracking"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlChangeTrackingType"/> </eClassifiers> @@ -116,7 +116,7 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbedded #//XmlAttributeMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddedId #//XmlAttributeMapping"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntity #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlQueryContainer #//XmlPropertyContainer #//v1_1/XmlEntity_1_1"> + <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntity #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlQueryContainer #//XmlPropertyContainer #//v1_1/XmlEntity_1_1 #//v2_0/XmlEntity_2_0"> <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy" @@ -134,7 +134,7 @@ <eClassifiers xsi:type="ecore:EClass" name="XmlJoinFetch" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="joinFetch" eType="#//XmlJoinFetchType"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToMany #//XmlAttributeMapping #//XmlJoinFetch #//v2_0/XmlCollectionMapping_2_0"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToMany #//XmlAttributeMapping #//XmlJoinFetch #//v2_0/XmlManyToMany_2_0"/> <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToOne #//XmlAttributeMapping #//XmlJoinFetch"/> <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlMappedSuperclass #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlPropertyContainer #//v1_1/XmlMappedSuperclass_1_1 #//v2_0/XmlMappedSuperclass_2_0"> <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking" @@ -173,7 +173,7 @@ eType="#//XmlConversionValue" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultObjectValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToMany #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch #//v2_0/XmlCollectionMapping_2_0"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToMany #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch #//v2_0/XmlOneToMany_2_0"/> <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToOne #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/> <eClassifiers xsi:type="ecore:EClass" name="XmlOptimisticLocking"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlOptimisticLockingType"/> @@ -206,7 +206,7 @@ upperBound="-1" eType="#//XmlNamedStoredProcedureQuery" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors" eSuperTypes="#//v2_0/XmlQueryRedirectors2_0"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors" eSuperTypes="#//v2_0/XmlQueryRedirectors_2_0"/> <eClassifiers xsi:type="ecore:EClass" name="XmlReadOnly" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> </eClassifiers> @@ -307,26 +307,26 @@ </eClassifiers> </eSubpackages> <eSubpackages name="v2_0" nsURI="jpt.eclipselink.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.eclipselink.core.resource.orm.v2_0"> - <eClassifiers xsi:type="ecore:EClass" name="XmlCacheInterceptor2_0" abstract="true" + <eClassifiers xsi:type="ecore:EClass" name="XmlCacheInterceptor_2_0" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionMapping_2_0" abstract="true" - interface="true" eSuperTypes="#//v2_0/XmlMapKeyAssociationOverrideContainer2_0"> + interface="true" eSuperTypes="#//v2_0/XmlMapKeyAssociationOverrideContainer_2_0"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyConvert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true" interface="true" eSuperTypes="#//XmlAttributeMapping #//XmlConvertibleMapping #//XmlConvertersHolder #//v2_0/XmlCollectionMapping_2_0"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlEntity2_0" abstract="true" interface="true" + <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_0" abstract="true" interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlEntity_2_0"> - <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor2_0" + <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor_2_0" containment="true" resolveProxies="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//v2_0/XmlQueryRedirectors2_0" + <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//v2_0/XmlQueryRedirectors_2_0" containment="true" resolveProxies="false"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true" interface="true" eSuperTypes="#//XmlConverterHolder #//v2_0/XmlCollectionMapping_2_0"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAssociationOverrideContainer2_0" + <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAssociationOverrideContainer_2_0" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAssociationOverrides" upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlAssociationOverride" @@ -334,7 +334,7 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_0" abstract="true" interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlCacheable_2_0"> - <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor2_0" + <eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor_2_0" containment="true" resolveProxies="false"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_0" abstract="true" @@ -343,7 +343,7 @@ interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="correctionType" eType="#//v2_0/OrderCorrectionType_2_0"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors2_0" abstract="true" + <eClassifiers xsi:type="ecore:EClass" name="XmlQueryRedirectors_2_0" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="allQueries" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="readAll" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java index 28ed395dbe..d3bf0feb02 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java @@ -725,7 +725,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_CACHE_INTERCEPTOR__CLASS_NAME = EclipseLinkOrmV2_0Package.XML_CACHE_INTERCEPTOR2_0__CLASS_NAME; + public static final int XML_CACHE_INTERCEPTOR__CLASS_NAME = EclipseLinkOrmV2_0Package.XML_CACHE_INTERCEPTOR_20__CLASS_NAME; /** * The number of structural features of the '<em>Xml Cache Interceptor</em>' class. * <!-- begin-user-doc --> @@ -733,7 +733,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_CACHE_INTERCEPTOR_FEATURE_COUNT = EclipseLinkOrmV2_0Package.XML_CACHE_INTERCEPTOR2_0_FEATURE_COUNT + 0; + public static final int XML_CACHE_INTERCEPTOR_FEATURE_COUNT = EclipseLinkOrmV2_0Package.XML_CACHE_INTERCEPTOR_20_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTracking <em>Xml Change Tracking</em>}' class. * <!-- begin-user-doc --> @@ -2064,13 +2064,29 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ENTITY__PRIMARY_KEY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11; /** + * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ENTITY__CACHE_INTERCEPTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12; + /** + * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ENTITY__QUERY_REDIRECTORS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13; + /** * The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12; + public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2078,7 +2094,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13; + public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15; /** * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2086,7 +2102,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14; + public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16; /** * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2094,7 +2110,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15; + public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17; /** * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute. * <!-- begin-user-doc --> @@ -2102,7 +2118,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16; + public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18; /** * The number of structural features of the '<em>Xml Entity</em>' class. * <!-- begin-user-doc --> @@ -2110,7 +2126,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17; + public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class. * <!-- begin-user-doc --> @@ -2653,13 +2669,45 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_MANY_TO_MANY__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 2; /** + * The feature id for the '<em><b>Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3; + /** + * The feature id for the '<em><b>Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4; + /** + * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 5; + /** + * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__STRUCT_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 6; + /** * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3; + public static final int XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. * <!-- begin-user-doc --> @@ -2667,7 +2715,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4; + public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 8; /** * The number of structural features of the '<em>Xml Many To Many</em>' class. * <!-- begin-user-doc --> @@ -2675,7 +2723,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 5; + public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 9; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class. * <!-- begin-user-doc --> @@ -3371,13 +3419,45 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 3; /** + * The feature id for the '<em><b>Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 4; + /** + * The feature id for the '<em><b>Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__TYPE_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 5; + /** + * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 6; + /** + * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__STRUCT_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 7; + /** * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 4; + public static final int XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. * <!-- begin-user-doc --> @@ -3385,7 +3465,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 5; + public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 9; /** * The number of structural features of the '<em>Xml One To Many</em>' class. * <!-- begin-user-doc --> @@ -3393,7 +3473,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 6; + public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 10; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class. * <!-- begin-user-doc --> @@ -3867,7 +3947,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__ALL_QUERIES = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__ALL_QUERIES; + public static final int XML_QUERY_REDIRECTORS__ALL_QUERIES = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__ALL_QUERIES; /** * The feature id for the '<em><b>Read All</b></em>' attribute. * <!-- begin-user-doc --> @@ -3875,7 +3955,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__READ_ALL = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__READ_ALL; + public static final int XML_QUERY_REDIRECTORS__READ_ALL = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__READ_ALL; /** * The feature id for the '<em><b>Read Object</b></em>' attribute. * <!-- begin-user-doc --> @@ -3883,7 +3963,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__READ_OBJECT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__READ_OBJECT; + public static final int XML_QUERY_REDIRECTORS__READ_OBJECT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__READ_OBJECT; /** * The feature id for the '<em><b>Report</b></em>' attribute. * <!-- begin-user-doc --> @@ -3891,7 +3971,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__REPORT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__REPORT; + public static final int XML_QUERY_REDIRECTORS__REPORT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__REPORT; /** * The feature id for the '<em><b>Update</b></em>' attribute. * <!-- begin-user-doc --> @@ -3899,7 +3979,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__UPDATE = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__UPDATE; + public static final int XML_QUERY_REDIRECTORS__UPDATE = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__UPDATE; /** * The feature id for the '<em><b>Insert</b></em>' attribute. * <!-- begin-user-doc --> @@ -3907,7 +3987,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__INSERT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__INSERT; + public static final int XML_QUERY_REDIRECTORS__INSERT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__INSERT; /** * The feature id for the '<em><b>Delete</b></em>' attribute. * <!-- begin-user-doc --> @@ -3915,7 +3995,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS__DELETE = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0__DELETE; + public static final int XML_QUERY_REDIRECTORS__DELETE = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__DELETE; /** * The number of structural features of the '<em>Xml Query Redirectors</em>' class. * <!-- begin-user-doc --> @@ -3923,7 +4003,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS_FEATURE_COUNT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS2_0_FEATURE_COUNT + 0; + public static final int XML_QUERY_REDIRECTORS_FEATURE_COUNT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlReadOnly <em>Xml Read Only</em>}' class. * <!-- begin-user-doc --> @@ -7312,7 +7392,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlBasicCollectionEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlBasicMapEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlBasicMapEClass.getESuperTypes().add(this.getXmlAttributeMapping()); - xmlCacheInterceptorEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlCacheInterceptor2_0()); + xmlCacheInterceptorEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlCacheInterceptor_2_0()); xmlConverterEClass.getESuperTypes().add(this.getXmlNamedConverter()); xmlConvertibleMappingEClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping()); xmlConvertibleMappingEClass.getESuperTypes().add(this.getXmlConverterHolder()); @@ -7336,6 +7416,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlEntityEClass.getESuperTypes().add(this.getXmlQueryContainer()); xmlEntityEClass.getESuperTypes().add(this.getXmlPropertyContainer()); xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlEntity_1_1()); + xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlEntity_2_0()); xmlEntityMappingsEClass.getESuperTypes().add(theOrmPackage.getXmlEntityMappings()); xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlConvertersHolder()); xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlQueryContainer()); @@ -7346,7 +7427,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlManyToManyEClass.getESuperTypes().add(theOrmPackage.getXmlManyToMany()); xmlManyToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlManyToManyEClass.getESuperTypes().add(this.getXmlJoinFetch()); - xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlCollectionMapping_2_0()); + xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlManyToMany_2_0()); xmlManyToOneEClass.getESuperTypes().add(theOrmPackage.getXmlManyToOne()); xmlManyToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlManyToOneEClass.getESuperTypes().add(this.getXmlJoinFetch()); @@ -7364,7 +7445,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlOneToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlOneToManyEClass.getESuperTypes().add(this.getXmlPrivateOwned()); xmlOneToManyEClass.getESuperTypes().add(this.getXmlJoinFetch()); - xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlCollectionMapping_2_0()); + xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOneToMany_2_0()); xmlOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOne()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlPrivateOwned()); @@ -7373,7 +7454,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlOrderColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOrderColumn_2_0()); xmlPersistenceUnitMetadataEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitMetadata()); xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlPrimaryKey_1_1()); - xmlQueryRedirectorsEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlQueryRedirectors2_0()); + xmlQueryRedirectorsEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlQueryRedirectors_2_0()); xmlStructConverterEClass.getESuperTypes().add(this.getXmlNamedConverter()); xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping()); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java index 55c9c3c4fe..f0abbfbdf0 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCacheInterceptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * Copyright (c) 2009, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,7 +21,7 @@ import org.eclipse.jpt.core.resource.orm.JPA; import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; -import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -40,7 +40,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlCacheInterceptor extends AbstractJpaEObject implements XmlCacheInterceptor2_0 +public class XmlCacheInterceptor extends AbstractJpaEObject implements XmlCacheInterceptor_2_0 { /** * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute. @@ -93,7 +93,7 @@ public class XmlCacheInterceptor extends AbstractJpaEObject implements XmlCacheI * <!-- end-user-doc --> * @return the value of the '<em>Class Name</em>' attribute. * @see #setClassName(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheInterceptor2_0_ClassName() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheInterceptor_2_0_ClassName() * @model * @generated */ @@ -208,6 +208,7 @@ public class XmlCacheInterceptor extends AbstractJpaEObject implements XmlCacheI elementName, structuralFeature, Translator.END_TAG_NO_INDENT, + EclipseLinkOrmPackage.eINSTANCE.getXmlCacheInterceptor(), buildTranslatorChildren() ); } @@ -219,7 +220,7 @@ public class XmlCacheInterceptor extends AbstractJpaEObject implements XmlCacheI } protected static Translator buildClassTranslator() { - return new Translator(JPA.CLASS, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCacheInterceptor2_0_ClassName(), Translator.DOM_ATTRIBUTE); + return new Translator(JPA.CLASS, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCacheInterceptor_2_0_ClassName(), Translator.DOM_ATTRIBUTE); } } // XmlCacheInterceptor diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java index 60e1d7fae6..d72be228f5 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0; -import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -680,7 +680,7 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides() * @model containment="true" * @generated */ @@ -1018,11 +1018,11 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class) + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES; default: return -1; } } @@ -1105,11 +1105,11 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class) + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES; default: return -1; } } @@ -1234,6 +1234,6 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE } protected static Translator buildMapKeyAssociationOverrideTranslator() { - return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()); + return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()); } } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java index 33aa5fa054..c5824604df 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Oracle. + * Copyright (c) 2008, 2010 Oracle. * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at @@ -29,6 +29,9 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1; import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -62,7 +65,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity implements XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlQueryContainer, XmlPropertyContainer, XmlEntity_1_1 +public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity implements XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlQueryContainer, XmlPropertyContainer, XmlEntity_1_1, XmlEntity_2_0 { /** * The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute. @@ -201,6 +204,26 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple protected XmlPrimaryKey_1_1 primaryKey; /** + * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCacheInterceptor() + * @generated + * @ordered + */ + protected XmlCacheInterceptor_2_0 cacheInterceptor; + + /** + * The cached value of the '{@link #getQueryRedirectors() <em>Query Redirectors</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getQueryRedirectors() + * @generated + * @ordered + */ + protected XmlQueryRedirectors_2_0 queryRedirectors; + + /** * The cached value of the '{@link #getOptimisticLocking() <em>Optimistic Locking</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -974,6 +997,126 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple } /** + * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Cache Interceptor</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Cache Interceptor</em>' containment reference. + * @see #setCacheInterceptor(XmlCacheInterceptor_2_0) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_0_CacheInterceptor() + * @model containment="true" + * @generated + */ + public XmlCacheInterceptor_2_0 getCacheInterceptor() + { + return cacheInterceptor; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor, NotificationChain msgs) + { + XmlCacheInterceptor_2_0 oldCacheInterceptor = cacheInterceptor; + cacheInterceptor = newCacheInterceptor; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, oldCacheInterceptor, newCacheInterceptor); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Cache Interceptor</em>' containment reference. + * @see #getCacheInterceptor() + * @generated + */ + public void setCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor) + { + if (newCacheInterceptor != cacheInterceptor) + { + NotificationChain msgs = null; + if (cacheInterceptor != null) + msgs = ((InternalEObject)cacheInterceptor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, null, msgs); + if (newCacheInterceptor != null) + msgs = ((InternalEObject)newCacheInterceptor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, null, msgs); + msgs = basicSetCacheInterceptor(newCacheInterceptor, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, newCacheInterceptor, newCacheInterceptor)); + } + + /** + * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Query Redirectors</em>' containment reference. + * @see #setQueryRedirectors(XmlQueryRedirectors_2_0) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_0_QueryRedirectors() + * @model containment="true" + * @generated + */ + public XmlQueryRedirectors_2_0 getQueryRedirectors() + { + return queryRedirectors; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetQueryRedirectors(XmlQueryRedirectors_2_0 newQueryRedirectors, NotificationChain msgs) + { + XmlQueryRedirectors_2_0 oldQueryRedirectors = queryRedirectors; + queryRedirectors = newQueryRedirectors; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, oldQueryRedirectors, newQueryRedirectors); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getQueryRedirectors <em>Query Redirectors</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Query Redirectors</em>' containment reference. + * @see #getQueryRedirectors() + * @generated + */ + public void setQueryRedirectors(XmlQueryRedirectors_2_0 newQueryRedirectors) + { + if (newQueryRedirectors != queryRedirectors) + { + NotificationChain msgs = null; + if (queryRedirectors != null) + msgs = ((InternalEObject)queryRedirectors).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, null, msgs); + if (newQueryRedirectors != null) + msgs = ((InternalEObject)newQueryRedirectors).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, null, msgs); + msgs = basicSetQueryRedirectors(newQueryRedirectors, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, newQueryRedirectors, newQueryRedirectors)); + } + + /** * Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute. * <!-- begin-user-doc --> * <p> @@ -1038,6 +1181,10 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: return basicSetPrimaryKey(null, msgs); + case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: + return basicSetCacheInterceptor(null, msgs); + case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: + return basicSetQueryRedirectors(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING: return basicSetOptimisticLocking(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY: @@ -1084,6 +1231,10 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple return getProperties(); case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: return getPrimaryKey(); + case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: + return getCacheInterceptor(); + case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: + return getQueryRedirectors(); case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING: return getOptimisticLocking(); case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY: @@ -1151,6 +1302,12 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: setPrimaryKey((XmlPrimaryKey_1_1)newValue); return; + case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: + setCacheInterceptor((XmlCacheInterceptor_2_0)newValue); + return; + case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: + setQueryRedirectors((XmlQueryRedirectors_2_0)newValue); + return; case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING: setOptimisticLocking((XmlOptimisticLocking)newValue); return; @@ -1216,6 +1373,12 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: setPrimaryKey((XmlPrimaryKey_1_1)null); return; + case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: + setCacheInterceptor((XmlCacheInterceptor_2_0)null); + return; + case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: + setQueryRedirectors((XmlQueryRedirectors_2_0)null); + return; case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING: setOptimisticLocking((XmlOptimisticLocking)null); return; @@ -1269,6 +1432,10 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple return properties != null && !properties.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: return primaryKey != null; + case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: + return cacheInterceptor != null; + case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: + return queryRedirectors != null; case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING: return optimisticLocking != null; case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY: @@ -1359,6 +1526,15 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple default: return -1; } } + if (baseClass == XmlEntity_2_0.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR; + case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS; + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -1438,6 +1614,15 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple default: return -1; } } + if (baseClass == XmlEntity_2_0.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR; + case EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS; + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } @@ -1552,11 +1737,11 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple } protected static Translator buildCacheInterceptorTranslator() { - return XmlCacheInterceptor.buildTranslator(EclipseLink2_0.CACHE_INTERCEPTOR, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity2_0_CacheInterceptor()); + return XmlCacheInterceptor.buildTranslator(EclipseLink2_0.CACHE_INTERCEPTOR, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity_2_0_CacheInterceptor()); } protected static Translator buildQueryRedirectorsTranslator() { - return XmlQueryRedirectors.buildTranslator(EclipseLink2_0.QUERY_REDIRECTORS, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity2_0_QueryRedirectors()); + return XmlQueryRedirectors.buildTranslator(EclipseLink2_0.QUERY_REDIRECTORS, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity_2_0_QueryRedirectors()); } protected static Translator buildConverterTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java index 924ad7a7ec..24ec59da25 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java @@ -29,7 +29,8 @@ import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0; -import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -53,7 +54,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMany implements XmlAttributeMapping, XmlJoinFetch, XmlCollectionMapping_2_0 +public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMany implements XmlAttributeMapping, XmlJoinFetch, XmlManyToMany_2_0 { /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. @@ -92,6 +93,46 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; /** + * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getConverter() + * @generated + * @ordered + */ + protected XmlConverter converter; + + /** + * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTypeConverter() + * @generated + * @ordered + */ + protected XmlTypeConverter typeConverter; + + /** + * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getObjectTypeConverter() + * @generated + * @ordered + */ + protected XmlObjectTypeConverter objectTypeConverter; + + /** + * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStructConverter() + * @generated + * @ordered + */ + protected XmlStructConverter structConverter; + + /** * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -181,6 +222,246 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa } /** + * Returns the value of the '<em><b>Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Converter</em>' containment reference. + * @see #setConverter(XmlConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter() + * @model containment="true" + * @generated + */ + public XmlConverter getConverter() + { + return converter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs) + { + XmlConverter oldConverter = converter; + converter = newConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, oldConverter, newConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#getConverter <em>Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Converter</em>' containment reference. + * @see #getConverter() + * @generated + */ + public void setConverter(XmlConverter newConverter) + { + if (newConverter != converter) + { + NotificationChain msgs = null; + if (converter != null) + msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, null, msgs); + if (newConverter != null) + msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, null, msgs); + msgs = basicSetConverter(newConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, newConverter, newConverter)); + } + + /** + * Returns the value of the '<em><b>Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Type Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Type Converter</em>' containment reference. + * @see #setTypeConverter(XmlTypeConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter() + * @model containment="true" + * @generated + */ + public XmlTypeConverter getTypeConverter() + { + return typeConverter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs) + { + XmlTypeConverter oldTypeConverter = typeConverter; + typeConverter = newTypeConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, oldTypeConverter, newTypeConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#getTypeConverter <em>Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Type Converter</em>' containment reference. + * @see #getTypeConverter() + * @generated + */ + public void setTypeConverter(XmlTypeConverter newTypeConverter) + { + if (newTypeConverter != typeConverter) + { + NotificationChain msgs = null; + if (typeConverter != null) + msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, null, msgs); + if (newTypeConverter != null) + msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, null, msgs); + msgs = basicSetTypeConverter(newTypeConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, newTypeConverter, newTypeConverter)); + } + + /** + * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Object Type Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Object Type Converter</em>' containment reference. + * @see #setObjectTypeConverter(XmlObjectTypeConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter() + * @model containment="true" + * @generated + */ + public XmlObjectTypeConverter getObjectTypeConverter() + { + return objectTypeConverter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs) + { + XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter; + objectTypeConverter = newObjectTypeConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Object Type Converter</em>' containment reference. + * @see #getObjectTypeConverter() + * @generated + */ + public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter) + { + if (newObjectTypeConverter != objectTypeConverter) + { + NotificationChain msgs = null; + if (objectTypeConverter != null) + msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs); + if (newObjectTypeConverter != null) + msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs); + msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter)); + } + + /** + * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Struct Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Struct Converter</em>' containment reference. + * @see #setStructConverter(XmlStructConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter() + * @model containment="true" + * @generated + */ + public XmlStructConverter getStructConverter() + { + return structConverter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs) + { + XmlStructConverter oldStructConverter = structConverter; + structConverter = newStructConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, oldStructConverter, newStructConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#getStructConverter <em>Struct Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Struct Converter</em>' containment reference. + * @see #getStructConverter() + * @generated + */ + public void setStructConverter(XmlStructConverter newStructConverter) + { + if (newStructConverter != structConverter) + { + NotificationChain msgs = null; + if (structConverter != null) + msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, null, msgs); + if (newStructConverter != null) + msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, null, msgs); + msgs = basicSetStructConverter(newStructConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, newStructConverter, newStructConverter)); + } + + /** * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}. * <!-- begin-user-doc --> @@ -190,7 +471,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides() * @model containment="true" * @generated */ @@ -335,6 +616,14 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: + return basicSetConverter(null, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: + return basicSetTypeConverter(null, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: + return basicSetObjectTypeConverter(null, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: + return basicSetStructConverter(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs); } @@ -357,6 +646,14 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa return getProperties(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: return getJoinFetch(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: + return getConverter(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: + return getTypeConverter(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: + return getObjectTypeConverter(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: + return getStructConverter(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return getMapKeyAssociationOverrides(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: @@ -386,6 +683,18 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: setJoinFetch((XmlJoinFetchType)newValue); return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: + setConverter((XmlConverter)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: + setTypeConverter((XmlTypeConverter)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: + setObjectTypeConverter((XmlObjectTypeConverter)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: + setStructConverter((XmlStructConverter)newValue); + return; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: getMapKeyAssociationOverrides().clear(); getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue); @@ -416,6 +725,18 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: setJoinFetch(JOIN_FETCH_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: + setConverter((XmlConverter)null); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: + setTypeConverter((XmlTypeConverter)null); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: + setObjectTypeConverter((XmlObjectTypeConverter)null); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: + setStructConverter((XmlStructConverter)null); + return; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: getMapKeyAssociationOverrides().clear(); return; @@ -442,6 +763,14 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa return properties != null && !properties.isEmpty(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: return joinFetch != JOIN_FETCH_EDEFAULT; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: + return converter != null; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: + return typeConverter != null; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: + return objectTypeConverter != null; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: + return structConverter != null; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: @@ -489,11 +818,22 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class) + if (baseClass == XmlConverterHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER; + default: return -1; + } + } + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES; default: return -1; } } @@ -505,6 +845,13 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa default: return -1; } } + if (baseClass == XmlManyToMany_2_0.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -547,11 +894,22 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class) + if (baseClass == XmlConverterHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER; + default: return -1; + } + } + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES; default: return -1; } } @@ -563,6 +921,13 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa default: return -1; } } + if (baseClass == XmlManyToMany_2_0.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } @@ -635,11 +1000,11 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa } protected static Translator buildMapKeyAttributeOverrideTranslator() { - return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()); + return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides()); } protected static Translator buildMapKeyAssociationOverrideTranslator() { - return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()); + return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()); } protected static Translator buildConverterTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java index 54d4b8ecf4..60e0bc5024 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Oracle. All rights reserved. + * Copyright (c) 2008, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -29,7 +29,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Pack import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; -import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -220,7 +220,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa * @generated * @ordered */ - protected XmlCacheInterceptor2_0 cacheInterceptor; + protected XmlCacheInterceptor_2_0 cacheInterceptor; /** * The cached value of the '{@link #getOptimisticLocking() <em>Optimistic Locking</em>}' containment reference. @@ -1016,12 +1016,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa * </p> * <!-- end-user-doc --> * @return the value of the '<em>Cache Interceptor</em>' containment reference. - * @see #setCacheInterceptor(XmlCacheInterceptor2_0) + * @see #setCacheInterceptor(XmlCacheInterceptor_2_0) * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_0_CacheInterceptor() * @model containment="true" * @generated */ - public XmlCacheInterceptor2_0 getCacheInterceptor() + public XmlCacheInterceptor_2_0 getCacheInterceptor() { return cacheInterceptor; } @@ -1031,9 +1031,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor2_0 newCacheInterceptor, NotificationChain msgs) + public NotificationChain basicSetCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor, NotificationChain msgs) { - XmlCacheInterceptor2_0 oldCacheInterceptor = cacheInterceptor; + XmlCacheInterceptor_2_0 oldCacheInterceptor = cacheInterceptor; cacheInterceptor = newCacheInterceptor; if (eNotificationRequired()) { @@ -1051,7 +1051,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa * @see #getCacheInterceptor() * @generated */ - public void setCacheInterceptor(XmlCacheInterceptor2_0 newCacheInterceptor) + public void setCacheInterceptor(XmlCacheInterceptor_2_0 newCacheInterceptor) { if (newCacheInterceptor != cacheInterceptor) { @@ -1247,7 +1247,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa setCacheable((Boolean)newValue); return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR: - setCacheInterceptor((XmlCacheInterceptor2_0)newValue); + setCacheInterceptor((XmlCacheInterceptor_2_0)newValue); return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING: setOptimisticLocking((XmlOptimisticLocking)newValue); @@ -1315,7 +1315,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa setCacheable(CACHEABLE_EDEFAULT); return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR: - setCacheInterceptor((XmlCacheInterceptor2_0)null); + setCacheInterceptor((XmlCacheInterceptor_2_0)null); return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING: setOptimisticLocking((XmlOptimisticLocking)null); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java index ccf903fa19..6602e4dd8a 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java @@ -29,7 +29,8 @@ import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0; -import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -53,7 +54,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany implements XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch, XmlCollectionMapping_2_0 +public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany implements XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch, XmlOneToMany_2_0 { /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. @@ -112,6 +113,46 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; /** + * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getConverter() + * @generated + * @ordered + */ + protected XmlConverter converter; + + /** + * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTypeConverter() + * @generated + * @ordered + */ + protected XmlTypeConverter typeConverter; + + /** + * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getObjectTypeConverter() + * @generated + * @ordered + */ + protected XmlObjectTypeConverter objectTypeConverter; + + /** + * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStructConverter() + * @generated + * @ordered + */ + protected XmlStructConverter structConverter; + + /** * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -236,6 +277,246 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany } /** + * Returns the value of the '<em><b>Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Converter</em>' containment reference. + * @see #setConverter(XmlConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter() + * @model containment="true" + * @generated + */ + public XmlConverter getConverter() + { + return converter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs) + { + XmlConverter oldConverter = converter; + converter = newConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, oldConverter, newConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#getConverter <em>Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Converter</em>' containment reference. + * @see #getConverter() + * @generated + */ + public void setConverter(XmlConverter newConverter) + { + if (newConverter != converter) + { + NotificationChain msgs = null; + if (converter != null) + msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, null, msgs); + if (newConverter != null) + msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, null, msgs); + msgs = basicSetConverter(newConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, newConverter, newConverter)); + } + + /** + * Returns the value of the '<em><b>Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Type Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Type Converter</em>' containment reference. + * @see #setTypeConverter(XmlTypeConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter() + * @model containment="true" + * @generated + */ + public XmlTypeConverter getTypeConverter() + { + return typeConverter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs) + { + XmlTypeConverter oldTypeConverter = typeConverter; + typeConverter = newTypeConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, oldTypeConverter, newTypeConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#getTypeConverter <em>Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Type Converter</em>' containment reference. + * @see #getTypeConverter() + * @generated + */ + public void setTypeConverter(XmlTypeConverter newTypeConverter) + { + if (newTypeConverter != typeConverter) + { + NotificationChain msgs = null; + if (typeConverter != null) + msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, null, msgs); + if (newTypeConverter != null) + msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, null, msgs); + msgs = basicSetTypeConverter(newTypeConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, newTypeConverter, newTypeConverter)); + } + + /** + * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Object Type Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Object Type Converter</em>' containment reference. + * @see #setObjectTypeConverter(XmlObjectTypeConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter() + * @model containment="true" + * @generated + */ + public XmlObjectTypeConverter getObjectTypeConverter() + { + return objectTypeConverter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs) + { + XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter; + objectTypeConverter = newObjectTypeConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Object Type Converter</em>' containment reference. + * @see #getObjectTypeConverter() + * @generated + */ + public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter) + { + if (newObjectTypeConverter != objectTypeConverter) + { + NotificationChain msgs = null; + if (objectTypeConverter != null) + msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs); + if (newObjectTypeConverter != null) + msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs); + msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter)); + } + + /** + * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Struct Converter</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Struct Converter</em>' containment reference. + * @see #setStructConverter(XmlStructConverter) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter() + * @model containment="true" + * @generated + */ + public XmlStructConverter getStructConverter() + { + return structConverter; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs) + { + XmlStructConverter oldStructConverter = structConverter; + structConverter = newStructConverter; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, oldStructConverter, newStructConverter); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#getStructConverter <em>Struct Converter</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Struct Converter</em>' containment reference. + * @see #getStructConverter() + * @generated + */ + public void setStructConverter(XmlStructConverter newStructConverter) + { + if (newStructConverter != structConverter) + { + NotificationChain msgs = null; + if (structConverter != null) + msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, null, msgs); + if (newStructConverter != null) + msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, null, msgs); + msgs = basicSetStructConverter(newStructConverter, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, newStructConverter, newStructConverter)); + } + + /** * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}. * <!-- begin-user-doc --> @@ -245,7 +526,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides() * @model containment="true" * @generated */ @@ -390,6 +671,14 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: + return basicSetConverter(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: + return basicSetTypeConverter(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: + return basicSetObjectTypeConverter(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: + return basicSetStructConverter(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs); } @@ -414,6 +703,14 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany return isPrivateOwned(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: return getJoinFetch(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: + return getConverter(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: + return getTypeConverter(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: + return getObjectTypeConverter(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: + return getStructConverter(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return getMapKeyAssociationOverrides(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: @@ -446,6 +743,18 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: setJoinFetch((XmlJoinFetchType)newValue); return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: + setConverter((XmlConverter)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: + setTypeConverter((XmlTypeConverter)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: + setObjectTypeConverter((XmlObjectTypeConverter)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: + setStructConverter((XmlStructConverter)newValue); + return; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: getMapKeyAssociationOverrides().clear(); getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue); @@ -479,6 +788,18 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: setJoinFetch(JOIN_FETCH_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: + setConverter((XmlConverter)null); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: + setTypeConverter((XmlTypeConverter)null); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: + setObjectTypeConverter((XmlObjectTypeConverter)null); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: + setStructConverter((XmlStructConverter)null); + return; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: getMapKeyAssociationOverrides().clear(); return; @@ -507,6 +828,14 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany return privateOwned != PRIVATE_OWNED_EDEFAULT; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: return joinFetch != JOIN_FETCH_EDEFAULT; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: + return converter != null; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: + return typeConverter != null; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: + return objectTypeConverter != null; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: + return structConverter != null; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: @@ -562,11 +891,22 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class) + if (baseClass == XmlConverterHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER; + default: return -1; + } + } + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES; default: return -1; } } @@ -578,6 +918,13 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany default: return -1; } } + if (baseClass == XmlOneToMany_2_0.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -628,11 +975,22 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class) + if (baseClass == XmlConverterHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER; + default: return -1; + } + } + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES; default: return -1; } } @@ -644,6 +1002,13 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany default: return -1; } } + if (baseClass == XmlOneToMany_2_0.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } @@ -725,7 +1090,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany } protected static Translator buildMapKeyAssociationOverrideTranslator() { - return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()); + return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()); } protected static Translator buildConverterTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java index 41f5e7c020..de7b431ce3 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlQueryRedirectors.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * Copyright (c) 2009, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,7 +21,7 @@ import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; -import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -40,7 +40,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryRedirectors2_0 +public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryRedirectors_2_0 { /** * The default value of the '{@link #getAllQueries() <em>All Queries</em>}' attribute. @@ -213,7 +213,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>All Queries</em>' attribute. * @see #setAllQueries(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_AllQueries() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_AllQueries() * @model * @generated */ @@ -248,7 +248,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>Read All</em>' attribute. * @see #setReadAll(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_ReadAll() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_ReadAll() * @model * @generated */ @@ -283,7 +283,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>Read Object</em>' attribute. * @see #setReadObject(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_ReadObject() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_ReadObject() * @model * @generated */ @@ -318,7 +318,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>Report</em>' attribute. * @see #setReport(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_Report() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Report() * @model * @generated */ @@ -353,7 +353,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>Update</em>' attribute. * @see #setUpdate(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_Update() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Update() * @model * @generated */ @@ -388,7 +388,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>Insert</em>' attribute. * @see #setInsert(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_Insert() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Insert() * @model * @generated */ @@ -423,7 +423,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR * <!-- end-user-doc --> * @return the value of the '<em>Delete</em>' attribute. * @see #setDelete(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors2_0_Delete() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Delete() * @model * @generated */ @@ -611,6 +611,7 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR elementName, structuralFeature, Translator.END_TAG_NO_INDENT, + EclipseLinkOrmPackage.eINSTANCE.getXmlQueryRedirectors(), buildTranslatorChildren() ); } @@ -628,30 +629,30 @@ public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryR } protected static Translator buildAllQueriesTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__ALL_QUERIES, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_AllQueries(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__ALL_QUERIES, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE); } protected static Translator buildReadAllTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__READ_ALL, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_ReadAll(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__READ_ALL, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_ReadAll(), Translator.DOM_ATTRIBUTE); } protected static Translator buildReadObjectTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__READ_OBJECT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_ReadObject(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__READ_OBJECT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_ReadObject(), Translator.DOM_ATTRIBUTE); } protected static Translator buildReportTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__REPORT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_AllQueries(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__REPORT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE); } protected static Translator buildUpdateTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__UPDATE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_AllQueries(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__UPDATE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE); } protected static Translator buildInsertTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__INSERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_AllQueries(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__INSERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE); } protected static Translator buildDeleteTranslator() { - return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__DELETE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors2_0_AllQueries(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__DELETE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE); } } // XmlQueryRedirectors diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java index 326911ac5c..e70d2f93a8 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java @@ -73,14 +73,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public static final EclipseLinkOrmV2_0Package eINSTANCE = org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package.init(); /** - * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0 <em>Xml Cache Interceptor2 0</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0 <em>Xml Cache Interceptor 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0() * @generated */ - public static final int XML_CACHE_INTERCEPTOR2_0 = 0; + public static final int XML_CACHE_INTERCEPTOR_20 = 0; /** * The feature id for the '<em><b>Class Name</b></em>' attribute. @@ -89,26 +89,26 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_CACHE_INTERCEPTOR2_0__CLASS_NAME = 0; + public static final int XML_CACHE_INTERCEPTOR_20__CLASS_NAME = 0; /** - * The number of structural features of the '<em>Xml Cache Interceptor2 0</em>' class. + * The number of structural features of the '<em>Xml Cache Interceptor 20</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_CACHE_INTERCEPTOR2_0_FEATURE_COUNT = 1; + public static final int XML_CACHE_INTERCEPTOR_20_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 <em>Xml Map Key Association Override Container2 0</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 <em>Xml Map Key Association Override Container 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0() * @generated */ - public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0 = 5; + public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20 = 5; /** * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list. @@ -117,16 +117,16 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES = 0; + public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES = 0; /** - * The number of structural features of the '<em>Xml Map Key Association Override Container2 0</em>' class. + * The number of structural features of the '<em>Xml Map Key Association Override Container 20</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0_FEATURE_COUNT = 1; + public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20_FEATURE_COUNT = 1; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0 <em>Xml Collection Mapping 20</em>}' class. @@ -145,7 +145,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES; + public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES; /** * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. @@ -154,7 +154,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0_FEATURE_COUNT + 0; + public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20_FEATURE_COUNT + 0; /** * The number of structural features of the '<em>Xml Collection Mapping 20</em>' class. @@ -163,7 +163,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_COLLECTION_MAPPING_20_FEATURE_COUNT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0_FEATURE_COUNT + 1; + public static final int XML_COLLECTION_MAPPING_20_FEATURE_COUNT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class. @@ -347,14 +347,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public static final int XML_ELEMENT_COLLECTION_20_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 14; /** - * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0 <em>Xml Entity2 0</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0() * @generated */ - public static final int XML_ENTITY2_0 = 3; + public static final int XML_ENTITY_20 = 3; /** * The feature id for the '<em><b>Cacheable</b></em>' attribute. @@ -363,7 +363,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY2_0__CACHEABLE = OrmV2_0Package.XML_ENTITY_20__CACHEABLE; + public static final int XML_ENTITY_20__CACHEABLE = OrmV2_0Package.XML_ENTITY_20__CACHEABLE; /** * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference. @@ -372,7 +372,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY2_0__CACHE_INTERCEPTOR = OrmV2_0Package.XML_ENTITY_20_FEATURE_COUNT + 0; + public static final int XML_ENTITY_20__CACHE_INTERCEPTOR = OrmV2_0Package.XML_ENTITY_20_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference. @@ -381,16 +381,16 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY2_0__QUERY_REDIRECTORS = OrmV2_0Package.XML_ENTITY_20_FEATURE_COUNT + 1; + public static final int XML_ENTITY_20__QUERY_REDIRECTORS = OrmV2_0Package.XML_ENTITY_20_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Xml Entity2 0</em>' class. + * The number of structural features of the '<em>Xml Entity 20</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ENTITY2_0_FEATURE_COUNT = OrmV2_0Package.XML_ENTITY_20_FEATURE_COUNT + 2; + public static final int XML_ENTITY_20_FEATURE_COUNT = OrmV2_0Package.XML_ENTITY_20_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0 <em>Xml Many To Many 20</em>}' class. @@ -604,14 +604,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public static final int XML_ORDER_COLUMN_20_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0 <em>Xml Query Redirectors2 0</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 <em>Xml Query Redirectors 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0() * @generated */ - public static final int XML_QUERY_REDIRECTORS2_0 = 9; + public static final int XML_QUERY_REDIRECTORS_20 = 9; /** * The feature id for the '<em><b>All Queries</b></em>' attribute. @@ -620,7 +620,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__ALL_QUERIES = 0; + public static final int XML_QUERY_REDIRECTORS_20__ALL_QUERIES = 0; /** * The feature id for the '<em><b>Read All</b></em>' attribute. @@ -629,7 +629,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__READ_ALL = 1; + public static final int XML_QUERY_REDIRECTORS_20__READ_ALL = 1; /** * The feature id for the '<em><b>Read Object</b></em>' attribute. @@ -638,7 +638,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__READ_OBJECT = 2; + public static final int XML_QUERY_REDIRECTORS_20__READ_OBJECT = 2; /** * The feature id for the '<em><b>Report</b></em>' attribute. @@ -647,7 +647,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__REPORT = 3; + public static final int XML_QUERY_REDIRECTORS_20__REPORT = 3; /** * The feature id for the '<em><b>Update</b></em>' attribute. @@ -656,7 +656,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__UPDATE = 4; + public static final int XML_QUERY_REDIRECTORS_20__UPDATE = 4; /** * The feature id for the '<em><b>Insert</b></em>' attribute. @@ -665,7 +665,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__INSERT = 5; + public static final int XML_QUERY_REDIRECTORS_20__INSERT = 5; /** * The feature id for the '<em><b>Delete</b></em>' attribute. @@ -674,16 +674,16 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0__DELETE = 6; + public static final int XML_QUERY_REDIRECTORS_20__DELETE = 6; /** - * The number of structural features of the '<em>Xml Query Redirectors2 0</em>' class. + * The number of structural features of the '<em>Xml Query Redirectors 20</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_QUERY_REDIRECTORS2_0_FEATURE_COUNT = 7; + public static final int XML_QUERY_REDIRECTORS_20_FEATURE_COUNT = 7; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}' enum. @@ -700,7 +700,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlCacheInterceptor2_0EClass = null; + private EClass xmlCacheInterceptor_2_0EClass = null; /** * <!-- begin-user-doc --> @@ -721,7 +721,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlEntity2_0EClass = null; + private EClass xmlEntity_2_0EClass = null; /** * <!-- begin-user-doc --> @@ -735,35 +735,35 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlMappedSuperclass_2_0EClass = null; + private EClass xmlMapKeyAssociationOverrideContainer_2_0EClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EClass xmlOneToMany_2_0EClass = null; + private EClass xmlMappedSuperclass_2_0EClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EClass xmlOrderColumn_2_0EClass = null; + private EClass xmlOneToMany_2_0EClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EClass xmlQueryRedirectors2_0EClass = null; + private EClass xmlOrderColumn_2_0EClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EClass xmlMapKeyAssociationOverrideContainer2_0EClass = null; + private EClass xmlQueryRedirectors_2_0EClass = null; /** * <!-- begin-user-doc --> @@ -849,31 +849,31 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0 <em>Xml Cache Interceptor2 0</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0 <em>Xml Cache Interceptor 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Cache Interceptor2 0</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0 + * @return the meta object for class '<em>Xml Cache Interceptor 20</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0 * @generated */ - public EClass getXmlCacheInterceptor2_0() + public EClass getXmlCacheInterceptor_2_0() { - return xmlCacheInterceptor2_0EClass; + return xmlCacheInterceptor_2_0EClass; } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0#getClassName <em>Class Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0#getClassName <em>Class Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Class Name</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0#getClassName() - * @see #getXmlCacheInterceptor2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0#getClassName() + * @see #getXmlCacheInterceptor_2_0() * @generated */ - public EAttribute getXmlCacheInterceptor2_0_ClassName() + public EAttribute getXmlCacheInterceptor_2_0_ClassName() { - return (EAttribute)xmlCacheInterceptor2_0EClass.getEStructuralFeatures().get(0); + return (EAttribute)xmlCacheInterceptor_2_0EClass.getEStructuralFeatures().get(0); } @@ -918,46 +918,46 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0 <em>Xml Entity2 0</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Entity2 0</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0 + * @return the meta object for class '<em>Xml Entity 20</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 * @generated */ - public EClass getXmlEntity2_0() + public EClass getXmlEntity_2_0() { - return xmlEntity2_0EClass; + return xmlEntity_2_0EClass; } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getCacheInterceptor <em>Cache Interceptor</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Cache Interceptor</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getCacheInterceptor() - * @see #getXmlEntity2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor() + * @see #getXmlEntity_2_0() * @generated */ - public EReference getXmlEntity2_0_CacheInterceptor() + public EReference getXmlEntity_2_0_CacheInterceptor() { - return (EReference)xmlEntity2_0EClass.getEStructuralFeatures().get(0); + return (EReference)xmlEntity_2_0EClass.getEStructuralFeatures().get(0); } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getQueryRedirectors <em>Query Redirectors</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Query Redirectors</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getQueryRedirectors() - * @see #getXmlEntity2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors() + * @see #getXmlEntity_2_0() * @generated */ - public EReference getXmlEntity2_0_QueryRedirectors() + public EReference getXmlEntity_2_0_QueryRedirectors() { - return (EReference)xmlEntity2_0EClass.getEStructuralFeatures().get(1); + return (EReference)xmlEntity_2_0EClass.getEStructuralFeatures().get(1); } @@ -975,6 +975,35 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 <em>Xml Map Key Association Override Container 20</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Map Key Association Override Container 20</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 + * @generated + */ + public EClass getXmlMapKeyAssociationOverrideContainer_2_0() + { + return xmlMapKeyAssociationOverrideContainer_2_0EClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>Map Key Association Overrides</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0#getMapKeyAssociationOverrides() + * @see #getXmlMapKeyAssociationOverrideContainer_2_0() + * @generated + */ + public EReference getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides() + { + return (EReference)xmlMapKeyAssociationOverrideContainer_2_0EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0 <em>Xml Mapped Superclass 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1045,150 +1074,121 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0 <em>Xml Query Redirectors2 0</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 <em>Xml Query Redirectors 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Query Redirectors2 0</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0 + * @return the meta object for class '<em>Xml Query Redirectors 20</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 * @generated */ - public EClass getXmlQueryRedirectors2_0() + public EClass getXmlQueryRedirectors_2_0() { - return xmlQueryRedirectors2_0EClass; + return xmlQueryRedirectors_2_0EClass; } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getAllQueries <em>All Queries</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries <em>All Queries</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>All Queries</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getAllQueries() - * @see #getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EAttribute getXmlQueryRedirectors2_0_AllQueries() + public EAttribute getXmlQueryRedirectors_2_0_AllQueries() { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(0); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(0); } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadAll <em>Read All</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll <em>Read All</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Read All</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadAll() - * @see #getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EAttribute getXmlQueryRedirectors2_0_ReadAll() + public EAttribute getXmlQueryRedirectors_2_0_ReadAll() { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(1); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(1); } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadObject <em>Read Object</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject <em>Read Object</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Read Object</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadObject() - * @see #getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EAttribute getXmlQueryRedirectors2_0_ReadObject() + public EAttribute getXmlQueryRedirectors_2_0_ReadObject() { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(2); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(2); } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReport <em>Report</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport <em>Report</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Report</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReport() - * @see #getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EAttribute getXmlQueryRedirectors2_0_Report() + public EAttribute getXmlQueryRedirectors_2_0_Report() { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(3); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(3); } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getUpdate <em>Update</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate <em>Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Update</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getUpdate() - * @see #getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EAttribute getXmlQueryRedirectors2_0_Update() + public EAttribute getXmlQueryRedirectors_2_0_Update() { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(4); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(4); } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getInsert <em>Insert</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert <em>Insert</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Insert</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getInsert() - * @see #getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EAttribute getXmlQueryRedirectors2_0_Insert() + public EAttribute getXmlQueryRedirectors_2_0_Insert() { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(5); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(5); } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getDelete <em>Delete</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete <em>Delete</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Delete</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getDelete() - * @see #getXmlQueryRedirectors2_0() - * @generated - */ - public EAttribute getXmlQueryRedirectors2_0_Delete() - { - return (EAttribute)xmlQueryRedirectors2_0EClass.getEStructuralFeatures().get(6); - } - - - /** - * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 <em>Xml Map Key Association Override Container2 0</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Map Key Association Override Container2 0</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 - * @generated - */ - public EClass getXmlMapKeyAssociationOverrideContainer2_0() - { - return xmlMapKeyAssociationOverrideContainer2_0EClass; - } - - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Map Key Association Overrides</em>'. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0#getMapKeyAssociationOverrides() - * @see #getXmlMapKeyAssociationOverrideContainer2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete() + * @see #getXmlQueryRedirectors_2_0() * @generated */ - public EReference getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides() + public EAttribute getXmlQueryRedirectors_2_0_Delete() { - return (EReference)xmlMapKeyAssociationOverrideContainer2_0EClass.getEStructuralFeatures().get(0); + return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(6); } @@ -1238,22 +1238,22 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl isCreated = true; // Create classes and their features - xmlCacheInterceptor2_0EClass = createEClass(XML_CACHE_INTERCEPTOR2_0); - createEAttribute(xmlCacheInterceptor2_0EClass, XML_CACHE_INTERCEPTOR2_0__CLASS_NAME); + xmlCacheInterceptor_2_0EClass = createEClass(XML_CACHE_INTERCEPTOR_20); + createEAttribute(xmlCacheInterceptor_2_0EClass, XML_CACHE_INTERCEPTOR_20__CLASS_NAME); xmlCollectionMapping_2_0EClass = createEClass(XML_COLLECTION_MAPPING_20); createEAttribute(xmlCollectionMapping_2_0EClass, XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT); xmlElementCollection_2_0EClass = createEClass(XML_ELEMENT_COLLECTION_20); - xmlEntity2_0EClass = createEClass(XML_ENTITY2_0); - createEReference(xmlEntity2_0EClass, XML_ENTITY2_0__CACHE_INTERCEPTOR); - createEReference(xmlEntity2_0EClass, XML_ENTITY2_0__QUERY_REDIRECTORS); + xmlEntity_2_0EClass = createEClass(XML_ENTITY_20); + createEReference(xmlEntity_2_0EClass, XML_ENTITY_20__CACHE_INTERCEPTOR); + createEReference(xmlEntity_2_0EClass, XML_ENTITY_20__QUERY_REDIRECTORS); xmlManyToMany_2_0EClass = createEClass(XML_MANY_TO_MANY_20); - xmlMapKeyAssociationOverrideContainer2_0EClass = createEClass(XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0); - createEReference(xmlMapKeyAssociationOverrideContainer2_0EClass, XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES); + xmlMapKeyAssociationOverrideContainer_2_0EClass = createEClass(XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20); + createEReference(xmlMapKeyAssociationOverrideContainer_2_0EClass, XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES); xmlMappedSuperclass_2_0EClass = createEClass(XML_MAPPED_SUPERCLASS_20); createEReference(xmlMappedSuperclass_2_0EClass, XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR); @@ -1263,14 +1263,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl xmlOrderColumn_2_0EClass = createEClass(XML_ORDER_COLUMN_20); createEAttribute(xmlOrderColumn_2_0EClass, XML_ORDER_COLUMN_20__CORRECTION_TYPE); - xmlQueryRedirectors2_0EClass = createEClass(XML_QUERY_REDIRECTORS2_0); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__ALL_QUERIES); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__READ_ALL); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__READ_OBJECT); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__REPORT); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__UPDATE); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__INSERT); - createEAttribute(xmlQueryRedirectors2_0EClass, XML_QUERY_REDIRECTORS2_0__DELETE); + xmlQueryRedirectors_2_0EClass = createEClass(XML_QUERY_REDIRECTORS_20); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__ALL_QUERIES); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__READ_ALL); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__READ_OBJECT); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__REPORT); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__UPDATE); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__INSERT); + createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__DELETE); // Create enums orderCorrectionType_2_0EEnum = createEEnum(ORDER_CORRECTION_TYPE_20); @@ -1310,12 +1310,12 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl // Set bounds for type parameters // Add supertypes to classes - xmlCollectionMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAssociationOverrideContainer2_0()); + xmlCollectionMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAssociationOverrideContainer_2_0()); xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAttributeMapping()); xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConvertibleMapping()); xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConvertersHolder()); xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0()); - xmlEntity2_0EClass.getESuperTypes().add(theOrmV2_0Package.getXmlEntity_2_0()); + xmlEntity_2_0EClass.getESuperTypes().add(theOrmV2_0Package.getXmlEntity_2_0()); xmlManyToMany_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConverterHolder()); xmlManyToMany_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0()); xmlMappedSuperclass_2_0EClass.getESuperTypes().add(theOrmV2_0Package.getXmlCacheable_2_0()); @@ -1323,39 +1323,39 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0()); // Initialize classes and features; add operations and parameters - initEClass(xmlCacheInterceptor2_0EClass, XmlCacheInterceptor2_0.class, "XmlCacheInterceptor2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlCacheInterceptor2_0_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, XmlCacheInterceptor2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlCacheInterceptor_2_0EClass, XmlCacheInterceptor_2_0.class, "XmlCacheInterceptor_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlCacheInterceptor_2_0_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, XmlCacheInterceptor_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlCollectionMapping_2_0EClass, XmlCollectionMapping_2_0.class, "XmlCollectionMapping_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlCollectionMapping_2_0_MapKeyConvert(), ecorePackage.getEString(), "mapKeyConvert", null, 0, 1, XmlCollectionMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlElementCollection_2_0EClass, XmlElementCollection_2_0.class, "XmlElementCollection_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(xmlEntity2_0EClass, XmlEntity2_0.class, "XmlEntity2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlEntity2_0_CacheInterceptor(), this.getXmlCacheInterceptor2_0(), null, "cacheInterceptor", null, 0, 1, XmlEntity2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getXmlEntity2_0_QueryRedirectors(), this.getXmlQueryRedirectors2_0(), null, "queryRedirectors", null, 0, 1, XmlEntity2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlEntity_2_0EClass, XmlEntity_2_0.class, "XmlEntity_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlEntity_2_0_CacheInterceptor(), this.getXmlCacheInterceptor_2_0(), null, "cacheInterceptor", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlEntity_2_0_QueryRedirectors(), this.getXmlQueryRedirectors_2_0(), null, "queryRedirectors", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlManyToMany_2_0EClass, XmlManyToMany_2_0.class, "XmlManyToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(xmlMapKeyAssociationOverrideContainer2_0EClass, XmlMapKeyAssociationOverrideContainer2_0.class, "XmlMapKeyAssociationOverrideContainer2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides(), theOrmPackage.getXmlAssociationOverride(), null, "mapKeyAssociationOverrides", null, 0, -1, XmlMapKeyAssociationOverrideContainer2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlMapKeyAssociationOverrideContainer_2_0EClass, XmlMapKeyAssociationOverrideContainer_2_0.class, "XmlMapKeyAssociationOverrideContainer_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides(), theOrmPackage.getXmlAssociationOverride(), null, "mapKeyAssociationOverrides", null, 0, -1, XmlMapKeyAssociationOverrideContainer_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlMappedSuperclass_2_0EClass, XmlMappedSuperclass_2_0.class, "XmlMappedSuperclass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlMappedSuperclass_2_0_CacheInterceptor(), this.getXmlCacheInterceptor2_0(), null, "cacheInterceptor", null, 0, 1, XmlMappedSuperclass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlMappedSuperclass_2_0_CacheInterceptor(), this.getXmlCacheInterceptor_2_0(), null, "cacheInterceptor", null, 0, 1, XmlMappedSuperclass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlOneToMany_2_0EClass, XmlOneToMany_2_0.class, "XmlOneToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlOrderColumn_2_0EClass, XmlOrderColumn_2_0.class, "XmlOrderColumn_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlOrderColumn_2_0_CorrectionType(), this.getOrderCorrectionType_2_0(), "correctionType", null, 0, 1, XmlOrderColumn_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlQueryRedirectors2_0EClass, XmlQueryRedirectors2_0.class, "XmlQueryRedirectors2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlQueryRedirectors2_0_AllQueries(), ecorePackage.getEString(), "allQueries", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlQueryRedirectors2_0_ReadAll(), ecorePackage.getEString(), "readAll", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlQueryRedirectors2_0_ReadObject(), ecorePackage.getEString(), "readObject", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlQueryRedirectors2_0_Report(), ecorePackage.getEString(), "report", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlQueryRedirectors2_0_Update(), ecorePackage.getEString(), "update", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlQueryRedirectors2_0_Insert(), ecorePackage.getEString(), "insert", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlQueryRedirectors2_0_Delete(), ecorePackage.getEString(), "delete", null, 0, 1, XmlQueryRedirectors2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlQueryRedirectors_2_0EClass, XmlQueryRedirectors_2_0.class, "XmlQueryRedirectors_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlQueryRedirectors_2_0_AllQueries(), ecorePackage.getEString(), "allQueries", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlQueryRedirectors_2_0_ReadAll(), ecorePackage.getEString(), "readAll", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlQueryRedirectors_2_0_ReadObject(), ecorePackage.getEString(), "readObject", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlQueryRedirectors_2_0_Report(), ecorePackage.getEString(), "report", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlQueryRedirectors_2_0_Update(), ecorePackage.getEString(), "update", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlQueryRedirectors_2_0_Insert(), ecorePackage.getEString(), "insert", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlQueryRedirectors_2_0_Delete(), ecorePackage.getEString(), "delete", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(orderCorrectionType_2_0EEnum, OrderCorrectionType_2_0.class, "OrderCorrectionType_2_0"); @@ -1379,14 +1379,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public interface Literals { /** - * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0 <em>Xml Cache Interceptor2 0</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0 <em>Xml Cache Interceptor 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0() * @generated */ - public static final EClass XML_CACHE_INTERCEPTOR2_0 = eINSTANCE.getXmlCacheInterceptor2_0(); + public static final EClass XML_CACHE_INTERCEPTOR_20 = eINSTANCE.getXmlCacheInterceptor_2_0(); /** * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature. @@ -1394,7 +1394,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_CACHE_INTERCEPTOR2_0__CLASS_NAME = eINSTANCE.getXmlCacheInterceptor2_0_ClassName(); + public static final EAttribute XML_CACHE_INTERCEPTOR_20__CLASS_NAME = eINSTANCE.getXmlCacheInterceptor_2_0_ClassName(); /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0 <em>Xml Collection Mapping 20</em>}' class. @@ -1425,14 +1425,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public static final EClass XML_ELEMENT_COLLECTION_20 = eINSTANCE.getXmlElementCollection_2_0(); /** - * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0 <em>Xml Entity2 0</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0() * @generated */ - public static final EClass XML_ENTITY2_0 = eINSTANCE.getXmlEntity2_0(); + public static final EClass XML_ENTITY_20 = eINSTANCE.getXmlEntity_2_0(); /** * The meta object literal for the '<em><b>Cache Interceptor</b></em>' containment reference feature. @@ -1440,7 +1440,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EReference XML_ENTITY2_0__CACHE_INTERCEPTOR = eINSTANCE.getXmlEntity2_0_CacheInterceptor(); + public static final EReference XML_ENTITY_20__CACHE_INTERCEPTOR = eINSTANCE.getXmlEntity_2_0_CacheInterceptor(); /** * The meta object literal for the '<em><b>Query Redirectors</b></em>' containment reference feature. @@ -1448,7 +1448,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EReference XML_ENTITY2_0__QUERY_REDIRECTORS = eINSTANCE.getXmlEntity2_0_QueryRedirectors(); + public static final EReference XML_ENTITY_20__QUERY_REDIRECTORS = eINSTANCE.getXmlEntity_2_0_QueryRedirectors(); /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0 <em>Xml Many To Many 20</em>}' class. @@ -1461,6 +1461,24 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public static final EClass XML_MANY_TO_MANY_20 = eINSTANCE.getXmlManyToMany_2_0(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 <em>Xml Map Key Association Override Container 20</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0() + * @generated + */ + public static final EClass XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20 = eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0(); + + /** + * The meta object literal for the '<em><b>Map Key Association Overrides</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EReference XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES = eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0 <em>Xml Mapped Superclass 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1507,14 +1525,14 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl public static final EAttribute XML_ORDER_COLUMN_20__CORRECTION_TYPE = eINSTANCE.getXmlOrderColumn_2_0_CorrectionType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0 <em>Xml Query Redirectors2 0</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 <em>Xml Query Redirectors 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0() * @generated */ - public static final EClass XML_QUERY_REDIRECTORS2_0 = eINSTANCE.getXmlQueryRedirectors2_0(); + public static final EClass XML_QUERY_REDIRECTORS_20 = eINSTANCE.getXmlQueryRedirectors_2_0(); /** * The meta object literal for the '<em><b>All Queries</b></em>' attribute feature. @@ -1522,7 +1540,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__ALL_QUERIES = eINSTANCE.getXmlQueryRedirectors2_0_AllQueries(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__ALL_QUERIES = eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(); /** * The meta object literal for the '<em><b>Read All</b></em>' attribute feature. @@ -1530,7 +1548,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__READ_ALL = eINSTANCE.getXmlQueryRedirectors2_0_ReadAll(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__READ_ALL = eINSTANCE.getXmlQueryRedirectors_2_0_ReadAll(); /** * The meta object literal for the '<em><b>Read Object</b></em>' attribute feature. @@ -1538,7 +1556,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__READ_OBJECT = eINSTANCE.getXmlQueryRedirectors2_0_ReadObject(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__READ_OBJECT = eINSTANCE.getXmlQueryRedirectors_2_0_ReadObject(); /** * The meta object literal for the '<em><b>Report</b></em>' attribute feature. @@ -1546,7 +1564,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__REPORT = eINSTANCE.getXmlQueryRedirectors2_0_Report(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__REPORT = eINSTANCE.getXmlQueryRedirectors_2_0_Report(); /** * The meta object literal for the '<em><b>Update</b></em>' attribute feature. @@ -1554,7 +1572,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__UPDATE = eINSTANCE.getXmlQueryRedirectors2_0_Update(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__UPDATE = eINSTANCE.getXmlQueryRedirectors_2_0_Update(); /** * The meta object literal for the '<em><b>Insert</b></em>' attribute feature. @@ -1562,7 +1580,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__INSERT = eINSTANCE.getXmlQueryRedirectors2_0_Insert(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__INSERT = eINSTANCE.getXmlQueryRedirectors_2_0_Insert(); /** * The meta object literal for the '<em><b>Delete</b></em>' attribute feature. @@ -1570,25 +1588,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final EAttribute XML_QUERY_REDIRECTORS2_0__DELETE = eINSTANCE.getXmlQueryRedirectors2_0_Delete(); - - /** - * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 <em>Xml Map Key Association Override Container2 0</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0() - * @generated - */ - public static final EClass XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0 = eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0(); - - /** - * The meta object literal for the '<em><b>Map Key Association Overrides</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final EReference XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES = eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides(); + public static final EAttribute XML_QUERY_REDIRECTORS_20__DELETE = eINSTANCE.getXmlQueryRedirectors_2_0_Delete(); /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}' enum. diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java index 064bb7901d..c28cac35e8 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * Copyright (c) 2009, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,16 +25,16 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0#getClassName <em>Class Name</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0#getClassName <em>Class Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0() * @model kind="class" interface="true" abstract="true" * @extends JpaEObject * @generated */ -public interface XmlCacheInterceptor2_0 extends JpaEObject +public interface XmlCacheInterceptor_2_0 extends JpaEObject { /** * Returns the value of the '<em><b>Class Name</b></em>' attribute. @@ -46,14 +46,14 @@ public interface XmlCacheInterceptor2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Class Name</em>' attribute. * @see #setClassName(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor2_0_ClassName() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0_ClassName() * @model * @generated */ String getClassName(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor2_0#getClassName <em>Class Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0#getClassName <em>Class Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Class Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java index f6944f70fe..ca7e7f78f7 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java @@ -33,7 +33,7 @@ package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0; * @model kind="class" interface="true" abstract="true" * @generated */ -public interface XmlCollectionMapping_2_0 extends XmlMapKeyAssociationOverrideContainer2_0 +public interface XmlCollectionMapping_2_0 extends XmlMapKeyAssociationOverrideContainer_2_0 { /** * Returns the value of the '<em><b>Map Key Convert</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java index 9fd909e393..df41f45fac 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * Copyright (c) 2009, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0; -import org.eclipse.jpt.core.resource.orm.v2_0.XmlEntity_2_0; - /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Entity2 0</b></em>'. @@ -25,16 +23,16 @@ import org.eclipse.jpt.core.resource.orm.v2_0.XmlEntity_2_0; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getCacheInterceptor <em>Cache Interceptor</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getQueryRedirectors <em>Query Redirectors</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface XmlEntity2_0 extends XmlEntity_2_0 +public interface XmlEntity_2_0 extends org.eclipse.jpt.core.resource.orm.v2_0.XmlEntity_2_0 { /** * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference. @@ -45,22 +43,22 @@ public interface XmlEntity2_0 extends XmlEntity_2_0 * </p> * <!-- end-user-doc --> * @return the value of the '<em>Cache Interceptor</em>' containment reference. - * @see #setCacheInterceptor(XmlCacheInterceptor2_0) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity2_0_CacheInterceptor() + * @see #setCacheInterceptor(XmlCacheInterceptor_2_0) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0_CacheInterceptor() * @model containment="true" * @generated */ - XmlCacheInterceptor2_0 getCacheInterceptor(); + XmlCacheInterceptor_2_0 getCacheInterceptor(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cache Interceptor</em>' containment reference. * @see #getCacheInterceptor() * @generated */ - void setCacheInterceptor(XmlCacheInterceptor2_0 value); + void setCacheInterceptor(XmlCacheInterceptor_2_0 value); /** * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference. @@ -71,21 +69,21 @@ public interface XmlEntity2_0 extends XmlEntity_2_0 * </p> * <!-- end-user-doc --> * @return the value of the '<em>Query Redirectors</em>' containment reference. - * @see #setQueryRedirectors(XmlQueryRedirectors2_0) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity2_0_QueryRedirectors() + * @see #setQueryRedirectors(XmlQueryRedirectors_2_0) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0_QueryRedirectors() * @model containment="true" * @generated */ - XmlQueryRedirectors2_0 getQueryRedirectors(); + XmlQueryRedirectors_2_0 getQueryRedirectors(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity2_0#getQueryRedirectors <em>Query Redirectors</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Query Redirectors</em>' containment reference. * @see #getQueryRedirectors() * @generated */ - void setQueryRedirectors(XmlQueryRedirectors2_0 value); + void setQueryRedirectors(XmlQueryRedirectors_2_0 value); } // XmlEntity2_0 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java index 3992e2a3e0..9fe379e680 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java @@ -30,16 +30,16 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0() * @model kind="class" interface="true" abstract="true" * @extends JpaEObject * @generated */ -public interface XmlMapKeyAssociationOverrideContainer2_0 extends JpaEObject +public interface XmlMapKeyAssociationOverrideContainer_2_0 extends JpaEObject { /** * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list. @@ -51,7 +51,7 @@ public interface XmlMapKeyAssociationOverrideContainer2_0 extends JpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list. - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java index 5f740b366e..7d26f6cdf5 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * Copyright (c) 2009, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -45,12 +45,12 @@ public interface XmlMappedSuperclass_2_0 extends XmlCacheable_2_0 * </p> * <!-- end-user-doc --> * @return the value of the '<em>Cache Interceptor</em>' containment reference. - * @see #setCacheInterceptor(XmlCacheInterceptor2_0) + * @see #setCacheInterceptor(XmlCacheInterceptor_2_0) * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0_CacheInterceptor() * @model containment="true" * @generated */ - XmlCacheInterceptor2_0 getCacheInterceptor(); + XmlCacheInterceptor_2_0 getCacheInterceptor(); /** * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference. @@ -60,6 +60,6 @@ public interface XmlMappedSuperclass_2_0 extends XmlCacheable_2_0 * @see #getCacheInterceptor() * @generated */ - void setCacheInterceptor(XmlCacheInterceptor2_0 value); + void setCacheInterceptor(XmlCacheInterceptor_2_0 value); } // XmlMappedSuperclass_2_0 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java index e70ee1bc26..285ca61da6 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors2_0.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * Copyright (c) 2009, 2010 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,22 +25,22 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getAllQueries <em>All Queries</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadAll <em>Read All</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadObject <em>Read Object</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReport <em>Report</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getUpdate <em>Update</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getInsert <em>Insert</em>}</li> - * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getDelete <em>Delete</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries <em>All Queries</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll <em>Read All</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject <em>Read Object</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport <em>Report</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate <em>Update</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert <em>Insert</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete <em>Delete</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0() * @model kind="class" interface="true" abstract="true" * @extends JpaEObject * @generated */ -public interface XmlQueryRedirectors2_0 extends JpaEObject +public interface XmlQueryRedirectors_2_0 extends JpaEObject { /** * Returns the value of the '<em><b>All Queries</b></em>' attribute. @@ -52,14 +52,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>All Queries</em>' attribute. * @see #setAllQueries(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_AllQueries() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_AllQueries() * @model * @generated */ String getAllQueries(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getAllQueries <em>All Queries</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries <em>All Queries</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>All Queries</em>' attribute. @@ -78,14 +78,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Read All</em>' attribute. * @see #setReadAll(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_ReadAll() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_ReadAll() * @model * @generated */ String getReadAll(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadAll <em>Read All</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll <em>Read All</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Read All</em>' attribute. @@ -104,14 +104,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Read Object</em>' attribute. * @see #setReadObject(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_ReadObject() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_ReadObject() * @model * @generated */ String getReadObject(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReadObject <em>Read Object</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject <em>Read Object</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Read Object</em>' attribute. @@ -130,14 +130,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Report</em>' attribute. * @see #setReport(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_Report() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Report() * @model * @generated */ String getReport(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getReport <em>Report</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport <em>Report</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Report</em>' attribute. @@ -156,14 +156,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Update</em>' attribute. * @see #setUpdate(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_Update() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Update() * @model * @generated */ String getUpdate(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getUpdate <em>Update</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate <em>Update</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Update</em>' attribute. @@ -182,14 +182,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Insert</em>' attribute. * @see #setInsert(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_Insert() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Insert() * @model * @generated */ String getInsert(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getInsert <em>Insert</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert <em>Insert</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Insert</em>' attribute. @@ -208,14 +208,14 @@ public interface XmlQueryRedirectors2_0 extends JpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Delete</em>' attribute. * @see #setDelete(String) - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0_Delete() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Delete() * @model * @generated */ String getDelete(); /** - * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors2_0#getDelete <em>Delete</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete <em>Delete</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Delete</em>' attribute. diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java index c794b0bb6f..512290067c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java @@ -70,6 +70,7 @@ public abstract class ContextModelTestCase extends AnnotationTestCase protected void tearDown() throws Exception { this.persistenceXmlResource = null; this.ormXmlResource = null; + getJpaProject().setUpdater(JpaProject.Updater.Null.instance()); JptCorePlugin.getWorkspacePreferences().clear(); this.waitForWorkspaceJobsToFinish(); super.tearDown(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java index 8af71cdb3f..50a0edb83f 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/model/JpaProjectManagerTests.java @@ -76,6 +76,11 @@ public class JpaProjectManagerTests extends TestCase { @Override protected void tearDown() throws Exception { + JpaProject jpaProject = JptCorePlugin.getJpaProject(this.testProject.getProject()); + if (jpaProject != null) { + jpaProject.setUpdater(JpaProject.Updater.Null.instance()); + } + this.testProject.getProject().delete(true, true, null); this.testProject = null; super.tearDown(); |