diff options
| author | kmoore | 2010-04-16 15:07:37 +0000 |
|---|---|---|
| committer | kmoore | 2010-04-16 15:07:37 +0000 |
| commit | cec5fa5d49d7f3eb5caf73eb4818f09bee71e825 (patch) | |
| tree | 3eef850a1295df4b05e27caab13860f2382cf751 | |
| parent | 020d1611b66cfc1f9e81f01471c6775ff273745b (diff) | |
| download | webtools.dali-cec5fa5d49d7f3eb5caf73eb4818f09bee71e825.tar.gz webtools.dali-cec5fa5d49d7f3eb5caf73eb4818f09bee71e825.tar.xz webtools.dali-cec5fa5d49d7f3eb5caf73eb4818f09bee71e825.zip | |
309236 - updating orm resource model to the latest eclipselink_orm_2_1.xsd changes
49 files changed, 6353 insertions, 748 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java index 466f6fa408..dbc04b541c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitDefaults.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 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. @@ -693,12 +693,12 @@ public class XmlPersistenceUnitDefaults extends AbstractJpaEObject implements Xm buildDelimitedIdentifiersTranslator(), buildAccessTranslator(), buildCascadePersistTranslator(), - EntityListeners.buildTranslator(JPA2_0.ENTITY_LISTENERS, OrmPackage.eINSTANCE.getXmlPersistenceUnitDefaults_EntityListeners()) + buildEntityListenersTranslator() }; } protected static Translator buildDescriptionTranslator() { - return new Translator(JPA2_0.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_0_Description()); + return new Translator(JPA.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_0_Description()); } protected static Translator buildSchemaTranslator() { @@ -720,4 +720,8 @@ public class XmlPersistenceUnitDefaults extends AbstractJpaEObject implements Xm protected static Translator buildCascadePersistTranslator() { return new EmptyTagBooleanTranslator(JPA.CASCADE_PERSIST, OrmPackage.eINSTANCE.getXmlPersistenceUnitDefaults_CascadePersist()); } + + protected static Translator buildEntityListenersTranslator() { + return EntityListeners.buildTranslator(JPA.ENTITY_LISTENERS, OrmPackage.eINSTANCE.getXmlPersistenceUnitDefaults_EntityListeners()); + } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java index 945f483238..c0bf2e6d9a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPersistenceUnitMetadata.java @@ -380,16 +380,12 @@ public class XmlPersistenceUnitMetadata extends AbstractJpaEObject implements Xm return new Translator[] { buildDescriptionTranslator(), buildXmlMappingMetadataCompleteTranslator(), - XmlPersistenceUnitDefaults.buildTranslator(JPA2_0.PERSISTENCE_UNIT_DEFAULTS, OrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults()) + XmlPersistenceUnitDefaults.buildTranslator(JPA.PERSISTENCE_UNIT_DEFAULTS, OrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults()) }; } protected static Translator buildDescriptionTranslator() { - return new Translator(JPA2_0.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlPersistenceUnitMetadata_2_0_Description()); - } - - protected static Translator buildXmlPersistenceUnitDefaultsTranslator() { - return XmlPersistenceUnitDefaults.buildTranslator(JPA.PERSISTENCE_UNIT_DEFAULTS, OrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults()); + return new Translator(JPA.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlPersistenceUnitMetadata_2_0_Description()); } protected static Translator buildXmlMappingMetadataCompleteTranslator() { 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 a851230f6c..5d8b811d9a 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel @@ -71,6 +71,10 @@ <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBasic"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicCollection"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBasicMap"/> + <genClasses ecoreClass="eclipselink_orm.ecore#//XmlBatchFetch"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//XmlBatchFetchHolder"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlBatchFetchHolder/batchFetch"/> + </genClasses> <genClasses ecoreClass="eclipselink_orm.ecore#//XmlCache"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/expiry"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlCache/size"/> @@ -189,6 +193,7 @@ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//XmlOptimisticLocking/selectedColumns"/> </genClasses> <genClasses ecoreClass="eclipselink_orm.ecore#//XmlOrderColumn"/> + <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitDefaults"/> <genClasses ecoreClass="eclipselink_orm.ecore#//XmlPersistenceUnitMetadata"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlPersistenceUnitMetadata/excludeDefaultMappings"/> </genClasses> @@ -302,13 +307,34 @@ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/CACHE_KEY"/> <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/AUTO"/> </genEnums> + <genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1"> + <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/JOIN"/> + <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/EXISTS"/> + <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1/IN"/> + </genEnums> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBasic_2_1"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnInsert"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/returnUpdate"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBasic_2_1/attributeType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1/size"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlBatchFetch_2_1/batchFetchType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlElementCollection_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlElementCollection_2_1/attributeType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEmbeddable_2_1"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEmbedded_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlEmbedded_2_1/attributeType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEmbeddedId_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlEmbeddedId_2_1/attributeType"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntity_2_1"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlEntity_2_1/classExtractor"/> </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntityMappings_2_1"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1/name"/> </genClasses> @@ -319,16 +345,34 @@ <genClasses ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1/fetchGroups"/> </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlId_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlId_2_1/attributeType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlManyToMany_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlManyToMany_2_1/attributeType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlManyToOne_2_1"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/sqlResultSetMappings"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/queryRedirectors"/> </genClasses> - <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1/returnOnly"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToMany_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlOneToMany_2_1/attributeType"/> </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToOne_2_1"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPersistenceUnitDefaults_2_1"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlPrimaryKey_2_1/cacheKeyType"/> </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlReturnInsert_2_1/returnOnly"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlTransformation_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlTransformation_2_1/attributeType"/> + </genClasses> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlVersion_2_1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlVersion_2_1/attributeType"/> + </genClasses> </nestedGenPackages> </genPackages> </genmodel:GenModel> 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 2690ad2dd7..4cee47290d 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 @@ -24,9 +24,15 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="variableOneToOnes" upperBound="-1" eType="#//XmlVariableOneToOne" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlBasic #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping #//v2_1/XmlBasic_2_1"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlBasic #//v2_1/XmlBasic_2_1 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlBasicMap" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlBatchFetch" eSuperTypes="#//v2_1/XmlBatchFetch_2_1"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlBatchFetchHolder" abstract="true" + interface="true"> + <eStructuralFeatures xsi:type="ecore:EReference" name="batchFetch" eType="#//XmlBatchFetch" + containment="true" resolveProxies="false"/> + </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlCache"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="expiry" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> @@ -102,8 +108,8 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="customizer" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlClassReference" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlElementCollection #//v2_0/XmlElementCollection_2_0"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddable #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlConvertersHolder #//XmlPropertyContainer"> + <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlElementCollection #//v2_0/XmlElementCollection_2_0 #//v2_1/XmlElementCollection_2_1"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddable #//v2_1/XmlEmbeddable_2_1 #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlConvertersHolder #//XmlPropertyContainer"> <eStructuralFeatures xsi:type="ecore:EReference" name="copyPolicy" eType="#//XmlCopyPolicy" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="instantiationCopyPolicy" @@ -113,8 +119,8 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> </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="XmlEmbedded" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbedded #//v2_1/XmlEmbedded_2_1 #//XmlAttributeMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEmbeddedId #//v2_1/XmlEmbeddedId_2_1 #//XmlAttributeMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntity #//v1_1/XmlEntity_1_1 #//v2_0/XmlEntity_2_0 #//v2_1/XmlEntity_2_1 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlQueryContainer #//XmlPropertyContainer"> <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking" containment="true" resolveProxies="false"/> @@ -130,13 +136,13 @@ <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlEntityMappings #//XmlConvertersHolder #//XmlQueryContainer"/> <eClassifiers xsi:type="ecore:EClass" name="XmlFetchAttribute" eSuperTypes="#//v2_1/XmlFetchAttribute_2_1"/> <eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroup" eSuperTypes="#//v2_1/XmlFetchGroup_2_1"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlId #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlId" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlId #//v2_1/XmlId_2_1 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlInstantiationCopyPolicy"/> <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/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="XmlManyToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToMany #//v2_0/XmlManyToMany_2_0 #//v2_1/XmlManyToMany_2_1 #//XmlAttributeMapping #//XmlJoinFetch"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlManyToOne #//v2_1/XmlManyToOne_2_1 #//XmlAttributeMapping #//XmlJoinFetch"/> <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlMappedSuperclass #//v1_1/XmlMappedSuperclass_1_1 #//v2_0/XmlMappedSuperclass_2_0 #//v2_1/XmlMappedSuperclass_2_1 #//XmlReadOnly #//XmlCustomizerHolder #//XmlChangeTrackingHolder #//XmlCacheHolder #//XmlConvertersHolder #//XmlPropertyContainer"> <eStructuralFeatures xsi:type="ecore:EReference" name="optimisticLocking" eType="#//XmlOptimisticLocking" containment="true" resolveProxies="false"/> @@ -174,8 +180,8 @@ 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/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="XmlOneToMany" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToMany #//v2_0/XmlOneToMany_2_0 #//v2_1/XmlOneToMany_2_1 #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOneToOne #//v2_1/XmlOneToOne_2_1 #//XmlAttributeMapping #//XmlPrivateOwned #//XmlJoinFetch"/> <eClassifiers xsi:type="ecore:EClass" name="XmlOptimisticLocking"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//XmlOptimisticLockingType"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascade" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> @@ -184,6 +190,7 @@ containment="true" resolveProxies="false"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlOrderColumn #//v2_0/XmlOrderColumn_2_0"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlPersistenceUnitDefaults #//v2_1/XmlPersistenceUnitDefaults_2_1"/> <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlPersistenceUnitMetadata"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultMappings" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/> @@ -229,14 +236,14 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="second" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="millisecond" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//v2_1/XmlTransformation_2_1 #//XmlAttributeMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlTransient" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlTransient #//XmlAttributeMapping"/> <eClassifiers xsi:type="ecore:EClass" name="XmlTypeConverter" eSuperTypes="#//XmlNamedConverter"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="objectType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlVariableOneToOne" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlVersion #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlVersion #//v2_1/XmlVersion_2_1 #//XmlAttributeMapping #//XmlMutable #//XmlConvertibleMapping"/> <eClassifiers xsi:type="ecore:EEnum" name="CacheCoordinationType"> <eLiterals name="SEND_OBJECT_CHANGES"/> <eLiterals name="INVALIDATE_CHANGED_OBJECTS" value="1"/> @@ -363,12 +370,33 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="returnInsert" eType="#//XmlReturnInsert" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnUpdate" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlBatchFetch_2_1" abstract="true" + interface="true"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="batchFetchType" eType="#//v2_1/BatchFetchType_2_1"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlJoinFetch #//XmlBatchFetchHolder"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlAccessMethodsHolder"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_1" abstract="true" interface="true"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId_2_1" abstract="true" + interface="true"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_1" abstract="true" interface="true" - eSuperTypes="#//v2_1/XmlFetchGroupContainer_2_1"> + eSuperTypes="#//XmlAccessMethodsHolder #//v2_1/XmlFetchGroupContainer_2_1"> <eStructuralFeatures xsi:type="ecore:EReference" name="classExtractor" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlClassReference" containment="true" resolveProxies="false"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlAccessMethodsHolder"/> <eClassifiers xsi:type="ecore:EClass" name="XmlFetchAttribute_2_1" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -384,26 +412,55 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="fetchGroups" upperBound="-1" eType="#//XmlFetchGroup" containment="true" resolveProxies="false"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlId_2_1" abstract="true" interface="true"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlBatchFetchHolder"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlBatchFetchHolder"/> <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_1" abstract="true" - interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAssociationOverrideContainer ../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeOverrideContainer #//v2_1/XmlFetchGroupContainer_2_1 ../../org.eclipse.jpt.core/model/orm.ecore#//XmlGeneratorContainer ../../org.eclipse.jpt.core/model/orm.ecore#//XmlQueryContainer #//XmlQueryContainer"> + interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//XmlAssociationOverrideContainer ../../org.eclipse.jpt.core/model/orm.ecore#//XmlAttributeOverrideContainer #//v2_1/XmlFetchGroupContainer_2_1 ../../org.eclipse.jpt.core/model/orm.ecore#//XmlGeneratorContainer ../../org.eclipse.jpt.core/model/orm.ecore#//XmlQueryContainer #//XmlQueryContainer #//XmlAccessMethodsHolder"> <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//SqlResultSetMapping" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors" containment="true" resolveProxies="false"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlBatchFetchHolder"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_1" abstract="true" interface="true" + eSuperTypes="#//XmlBatchFetchHolder"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_1" abstract="true" + interface="true" eSuperTypes="#//XmlAccessMethodsHolder"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey_2_1" abstract="true" + interface="true"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheKeyType" eType="#//v2_1/CacheKeyType_2_1"/> + </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlReturnInsert_2_1" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKey_2_1" abstract="true" + <eClassifiers xsi:type="ecore:EClass" name="XmlTransformation_2_1" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheKeyType" eType="#//v2_1/CacheKeyType_2_1"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="XmlVersion_2_1" abstract="true" interface="true"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="CacheKeyType_2_1"> <eLiterals name="ID_VALUE" literal="ID_VALUE"/> <eLiterals name="CACHE_KEY" value="1"/> <eLiterals name="AUTO" value="2"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EEnum" name="BatchFetchType_2_1"> + <eLiterals name="JOIN"/> + <eLiterals name="EXISTS" value="1"/> + <eLiterals name="IN" value="2"/> + </eClassifiers> </eSubpackages> </ecore:EPackage> diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd index e36c7a13a1..2a6c1ea065 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd @@ -15,13 +15,15 @@ <!-- - 296289: Add current annotation metadata support on mapped superclasses to EclipseLink-ORM.XML Schema --> <!-- - 296612: Add current annotation only metadata support of return insert/update to the EclipseLink-ORM.XML Schema --> <!-- - formatted to match orm_2_0.xsd so that users can easily compare the two schemas --> +<!-- 5/4/2010-2.1 Guy Pelletier --> +<!-- - 227219: Expand EclipseLink-ORM.XML schema functionality for 2.1 release (update version to 2.1) --> <!-- ************************************************************************************************************************** --> <!-- Java Persistence API object-relational mapping file schema --> -<xsd:schema xmlns:orm="http://www.eclipse.org/eclipselink/xsds/persistence/orm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.eclipse.org/eclipselink/xsds/persistence/orm" version="2.0"> +<xsd:schema xmlns:orm="http://www.eclipse.org/eclipselink/xsds/persistence/orm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.eclipse.org/eclipselink/xsds/persistence/orm" version="2.1"> <xsd:annotation> <xsd:documentation> - @(#)eclipselink_orm_2_0.xsd 2.0 December 02 2009 + @(#)eclipselink_orm_2_1.xsd 2.1 April 05 2010 </xsd:documentation> </xsd:annotation> @@ -42,8 +44,8 @@ <entity-mappings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/eclipselink/xsds/persistence/orm - eclipselink_orm_2_0.xsd - version="2.0"> + eclipselink_orm_2_1.xsd + version="2.1"> ... </entity-mappings> @@ -508,6 +510,7 @@ <xsd:element minOccurs="0" name="schema" type="xsd:string"/> <xsd:element minOccurs="0" name="catalog" type="xsd:string"/> <xsd:element minOccurs="0" name="access" type="orm:access-type"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="converter" type="orm:converter"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="type-converter" type="orm:type-converter"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="object-type-converter" type="orm:object-type-converter"/> @@ -638,6 +641,7 @@ <xsd:element minOccurs="0" name="catalog" type="xsd:string"/> <xsd:element minOccurs="0" name="delimited-identifiers" type="orm:emptyType"/> <xsd:element minOccurs="0" name="access" type="orm:access-type"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> <xsd:element minOccurs="0" name="cascade-persist" type="orm:emptyType"/> <xsd:element minOccurs="0" name="entity-listeners" type="orm:entity-listeners"/> </xsd:sequence> @@ -666,6 +670,7 @@ </xsd:annotation> <xsd:sequence> <xsd:element minOccurs="0" name="description" type="xsd:string"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> <xsd:element minOccurs="0" name="customizer" type="orm:customizer"/> <xsd:element minOccurs="0" name="change-tracking" type="orm:change-tracking"/> <xsd:element minOccurs="0" name="table" type="orm:table"/> @@ -738,6 +743,7 @@ <xsd:restriction base="xsd:token"> <xsd:enumeration value="PROPERTY"/> <xsd:enumeration value="FIELD"/> + <xsd:enumeration value="VIRTUAL"/> </xsd:restriction> </xsd:simpleType> @@ -855,15 +861,16 @@ <xsd:element minOccurs="0" name="table-generator" type="orm:table-generator"/> <xsd:element minOccurs="0" name="sequence-generator" type="orm:sequence-generator"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> - <xsd:element maxOccurs="1" minOccurs="0" name="return-insert" type="orm:return-insert"/> - <xsd:element maxOccurs="1" minOccurs="0" name="return-update" type="orm:emptyType"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="return-insert" type="orm:return-insert"/> + <xsd:element minOccurs="0" name="return-update" type="orm:emptyType"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="fetch" type="orm:fetch-type"/> <xsd:attribute name="optional" type="xsd:boolean"/> <xsd:attribute name="access" type="orm:access-type"/> <xsd:attribute name="mutable" type="xsd:boolean"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -905,8 +912,9 @@ </xsd:choice> <xsd:element minOccurs="0" name="collection-table" type="orm:eclipselink-collection-table"/> <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="fetch" type="orm:fetch-type"/> @@ -975,8 +983,9 @@ </xsd:choice> <xsd:element minOccurs="0" name="collection-table" type="orm:eclipselink-collection-table"/> <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="fetch" type="orm:fetch-type"/> @@ -1485,13 +1494,16 @@ <xsd:element name="struct-converter" type="orm:struct-converter"/> </xsd:choice> <xsd:element minOccurs="0" name="collection-table" type="orm:collection-table"/> + <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="target-class" type="xsd:string"/> <xsd:attribute name="fetch" type="orm:fetch-type"/> <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -1514,6 +1526,7 @@ </xsd:annotation> <xsd:sequence> <xsd:element minOccurs="0" name="description" type="xsd:string"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> <xsd:element minOccurs="0" name="customizer" type="orm:customizer"/> <xsd:element minOccurs="0" name="change-tracking" type="orm:change-tracking"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="converter" type="orm:converter"/> @@ -1547,10 +1560,11 @@ <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute-override" type="orm:attribute-override"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="association-override" type="orm:association-override"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -1567,10 +1581,11 @@ <xsd:sequence> <xsd:element maxOccurs="unbounded" minOccurs="0" name="attribute-override" type="orm:attribute-override"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="access" type="orm:access-type"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -1817,11 +1832,12 @@ <xsd:element minOccurs="0" name="table-generator" type="orm:table-generator"/> <xsd:element minOccurs="0" name="sequence-generator" type="orm:sequence-generator"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="access" type="orm:access-type"/> <xsd:attribute name="mutable" type="xsd:boolean"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -2044,6 +2060,43 @@ </xsd:restriction> </xsd:simpleType> +<!-- **************************************************** --> + + <xsd:simpleType name="batch-fetch-type"> + <xsd:annotation> + <xsd:documentation> + public enum BatchFetchType { + /** + * This is the default form of batch reading. + * The original query's selection criteria is joined with the batch query. + */ + JOIN, + + /** + * This uses an SQL EXISTS and a sub-select in the batch query instead of a join. + * This has the advantage of not requiring an SQL DISTINCT which can have issues + * with LOBs, or may be more efficient for some types of queries or on some databases. + */ + EXISTS, + + /** + * This uses an SQL IN clause in the batch query passing in the source object Ids. + * This has the advantage of only selecting the objects not already contained in the cache, + * and can work better with cursors, or if joins cannot be used. + * This may only work for singleton Ids on some databases. + */ + IN + } + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="JOIN"/> + <xsd:enumeration value="EXISTS"/> + <xsd:enumeration value="IN"/> + </xsd:restriction> + </xsd:simpleType> + <!-- **************************************************** --> <xsd:complexType name="join-table"> @@ -2157,14 +2210,16 @@ <xsd:element minOccurs="0" name="join-table" type="orm:join-table"/> <xsd:element minOccurs="0" name="cascade" type="orm:cascade-type"/> <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="target-entity" type="xsd:string"/> <xsd:attribute name="fetch" type="orm:fetch-type"/> <xsd:attribute name="access" type="orm:access-type"/> <xsd:attribute name="mapped-by" type="xsd:string"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -2190,8 +2245,9 @@ </xsd:choice> <xsd:element minOccurs="0" name="cascade" type="orm:cascade-type"/> <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="target-entity" type="xsd:string"/> @@ -2319,6 +2375,7 @@ </xsd:annotation> <xsd:sequence> <xsd:element minOccurs="0" name="description" type="xsd:string"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> <xsd:element minOccurs="0" name="customizer" type="orm:customizer"/> <xsd:element minOccurs="0" name="change-tracking" type="orm:change-tracking"/> <xsd:element minOccurs="0" name="id-class" type="orm:id-class"/> @@ -2587,8 +2644,9 @@ <xsd:element minOccurs="0" name="cascade" type="orm:cascade-type"/> <xsd:element minOccurs="0" name="private-owned" type="orm:emptyType"/> <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="target-entity" type="xsd:string"/> @@ -2596,6 +2654,7 @@ <xsd:attribute name="access" type="orm:access-type"/> <xsd:attribute name="mapped-by" type="xsd:string"/> <xsd:attribute name="orphan-removal" type="xsd:boolean"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -2625,8 +2684,9 @@ <xsd:element minOccurs="0" name="cascade" type="orm:cascade-type"/> <xsd:element minOccurs="0" name="private-owned" type="orm:emptyType"/> <xsd:element minOccurs="0" name="join-fetch" type="orm:join-fetch-type"/> + <xsd:element minOccurs="0" name="batch-fetch" type="orm:batch-fetch-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="target-entity" type="xsd:string"/> @@ -3552,13 +3612,14 @@ public @interface QueryRedirectors { <xsd:element maxOccurs="unbounded" minOccurs="0" name="write-transformer" type="orm:write-transformer"/> <xsd:element minOccurs="0" name="access" type="orm:access-type"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="fetch" type="orm:fetch-type"/> <xsd:attribute name="optional" type="xsd:boolean"/> <xsd:attribute name="access" type="orm:access-type"/> <xsd:attribute name="mutable" type="xsd:boolean"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> @@ -3712,7 +3773,7 @@ public @interface QueryRedirectors { <xsd:element maxOccurs="unbounded" minOccurs="0" name="join-column" type="orm:join-column"/> <xsd:element minOccurs="0" name="private-owned" type="orm:emptyType"/> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="target-interface" type="xsd:string"/> @@ -3746,11 +3807,12 @@ public @interface QueryRedirectors { <xsd:element name="struct-converter" type="orm:struct-converter"/> </xsd:choice> <xsd:element maxOccurs="unbounded" minOccurs="0" name="property" type="orm:property"/> - <xsd:element maxOccurs="1" minOccurs="0" name="access-methods" type="orm:access-methods"/> + <xsd:element minOccurs="0" name="access-methods" type="orm:access-methods"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="access" type="orm:access-type"/> <xsd:attribute name="mutable" type="xsd:boolean"/> + <xsd:attribute name="attribute-type" type="xsd:string"/> </xsd:complexType> <!-- **************************************************** --> diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java index 3967e3c9e8..713f205fad 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java @@ -86,6 +86,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl case EclipseLinkOrmPackage.XML_BASIC: return (EObject)createXmlBasic(); case EclipseLinkOrmPackage.XML_BASIC_COLLECTION: return (EObject)createXmlBasicCollection(); case EclipseLinkOrmPackage.XML_BASIC_MAP: return (EObject)createXmlBasicMap(); + case EclipseLinkOrmPackage.XML_BATCH_FETCH: return (EObject)createXmlBatchFetch(); case EclipseLinkOrmPackage.XML_CACHE: return (EObject)createXmlCache(); case EclipseLinkOrmPackage.XML_CHANGE_TRACKING: return (EObject)createXmlChangeTracking(); case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY: return (EObject)createXmlCloneCopyPolicy(); @@ -113,6 +114,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl case EclipseLinkOrmPackage.XML_ONE_TO_ONE: return (EObject)createXmlOneToOne(); case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING: return (EObject)createXmlOptimisticLocking(); case EclipseLinkOrmPackage.XML_ORDER_COLUMN: return (EObject)createXmlOrderColumn(); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS: return (EObject)createXmlPersistenceUnitDefaults(); case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA: return (EObject)createXmlPersistenceUnitMetadata(); case EclipseLinkOrmPackage.XML_PRIMARY_KEY: return (EObject)createXmlPrimaryKey(); case EclipseLinkOrmPackage.XML_PROPERTY: return (EObject)createXmlProperty(); @@ -249,6 +251,17 @@ public class EclipseLinkOrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ + public XmlBatchFetch createXmlBatchFetch() + { + XmlBatchFetch xmlBatchFetch = new XmlBatchFetch(); + return xmlBatchFetch; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public XmlCache createXmlCache() { XmlCache xmlCache = new XmlCache(); @@ -546,6 +559,17 @@ public class EclipseLinkOrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ + public XmlPersistenceUnitDefaults createXmlPersistenceUnitDefaults() + { + XmlPersistenceUnitDefaults xmlPersistenceUnitDefaults = new XmlPersistenceUnitDefaults(); + return xmlPersistenceUnitDefaults; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public XmlPersistenceUnitMetadata createXmlPersistenceUnitMetadata() { XmlPersistenceUnitMetadata xmlPersistenceUnitMetadata = new XmlPersistenceUnitMetadata(); 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 32ead5af93..5579282fc2 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 @@ -395,109 +395,117 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_BASIC__OPTIONAL = OrmPackage.XML_BASIC__OPTIONAL; /** - * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__ACCESS_METHODS = OrmPackage.XML_BASIC_FEATURE_COUNT + 0; + public static final int XML_BASIC__SEQUENCE_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Properties</b></em>' containment reference list. + * The feature id for the '<em><b>Table Generator</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__PROPERTIES = OrmPackage.XML_BASIC_FEATURE_COUNT + 1; + public static final int XML_BASIC__TABLE_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Mutable</b></em>' attribute. + * The feature id for the '<em><b>Generated Value</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 2; + public static final int XML_BASIC__GENERATED_VALUE = OrmPackage.XML_BASIC_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Converter</b></em>' containment reference. + * The feature id for the '<em><b>Return Insert</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 3; + public static final int XML_BASIC__RETURN_INSERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Type Converter</b></em>' containment reference. + * The feature id for the '<em><b>Return Update</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 4; + public static final int XML_BASIC__RETURN_UPDATE = OrmPackage.XML_BASIC_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 5; + public static final int XML_BASIC__ATTRIBUTE_TYPE = OrmPackage.XML_BASIC_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__STRUCT_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 6; + public static final int XML_BASIC__ACCESS_METHODS = OrmPackage.XML_BASIC_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Convert</b></em>' attribute. + * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 7; + public static final int XML_BASIC__PROPERTIES = OrmPackage.XML_BASIC_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference. + * The feature id for the '<em><b>Mutable</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__SEQUENCE_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 8; + public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 8; /** - * The feature id for the '<em><b>Table Generator</b></em>' containment reference. + * 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_BASIC__TABLE_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 9; + public static final int XML_BASIC__CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 9; /** - * The feature id for the '<em><b>Generated Value</b></em>' containment reference. + * 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_BASIC__GENERATED_VALUE = OrmPackage.XML_BASIC_FEATURE_COUNT + 10; + public static final int XML_BASIC__TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 10; /** - * The feature id for the '<em><b>Return Insert</b></em>' containment reference. + * 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_BASIC__RETURN_INSERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 11; + public static final int XML_BASIC__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 11; /** - * The feature id for the '<em><b>Return Update</b></em>' attribute. + * 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_BASIC__STRUCT_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 12; + /** + * The feature id for the '<em><b>Convert</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC__RETURN_UPDATE = OrmPackage.XML_BASIC_FEATURE_COUNT + 12; + public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 13; /** * The number of structural features of the '<em>Xml Basic</em>' class. * <!-- begin-user-doc --> @@ -505,7 +513,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 13; + public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 14; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class. * <!-- begin-user-doc --> @@ -605,6 +613,64 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_BASIC_MAP_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2; /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch <em>Xml Batch Fetch</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch() + * @generated + */ + public static final int XML_BATCH_FETCH = 7; + /** + * The feature id for the '<em><b>Size</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BATCH_FETCH__SIZE = EclipseLinkOrmV2_1Package.XML_BATCH_FETCH_21__SIZE; + /** + * The feature id for the '<em><b>Batch Fetch Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BATCH_FETCH__BATCH_FETCH_TYPE = EclipseLinkOrmV2_1Package.XML_BATCH_FETCH_21__BATCH_FETCH_TYPE; + /** + * The number of structural features of the '<em>Xml Batch Fetch</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BATCH_FETCH_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_BATCH_FETCH_21_FEATURE_COUNT + 0; + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder <em>Xml Batch Fetch Holder</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder() + * @generated + */ + public static final int XML_BATCH_FETCH_HOLDER = 8; + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BATCH_FETCH_HOLDER__BATCH_FETCH = 0; + /** + * The number of structural features of the '<em>Xml Batch Fetch Holder</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BATCH_FETCH_HOLDER_FEATURE_COUNT = 1; + /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -612,7 +678,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache() * @generated */ - public static final int XML_CACHE = 7; + public static final int XML_CACHE = 9; /** * The feature id for the '<em><b>Expiry</b></em>' attribute. * <!-- begin-user-doc --> @@ -701,7 +767,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder() * @generated */ - public static final int XML_CACHE_HOLDER = 8; + public static final int XML_CACHE_HOLDER = 10; /** * The feature id for the '<em><b>Cache</b></em>' containment reference. * <!-- begin-user-doc --> @@ -734,7 +800,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking() * @generated */ - public static final int XML_CHANGE_TRACKING = 9; + public static final int XML_CHANGE_TRACKING = 11; /** * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> @@ -759,7 +825,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder() * @generated */ - public static final int XML_CHANGE_TRACKING_HOLDER = 10; + public static final int XML_CHANGE_TRACKING_HOLDER = 12; /** * The feature id for the '<em><b>Change Tracking</b></em>' containment reference. * <!-- begin-user-doc --> @@ -784,7 +850,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy() * @generated */ - public static final int XML_CLONE_COPY_POLICY = 11; + public static final int XML_CLONE_COPY_POLICY = 13; /** * The feature id for the '<em><b>Method</b></em>' attribute. * <!-- begin-user-doc --> @@ -817,7 +883,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue() * @generated */ - public static final int XML_CONVERSION_VALUE = 12; + public static final int XML_CONVERSION_VALUE = 14; /** * The feature id for the '<em><b>Data Value</b></em>' attribute. * <!-- begin-user-doc --> @@ -850,7 +916,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter() * @generated */ - public static final int XML_NAMED_CONVERTER = 35; + public static final int XML_NAMED_CONVERTER = 37; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -875,7 +941,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter() * @generated */ - public static final int XML_CONVERTER = 13; + public static final int XML_CONVERTER = 15; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -908,7 +974,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder() * @generated */ - public static final int XML_CONVERTER_HOLDER = 14; + public static final int XML_CONVERTER_HOLDER = 16; /** * The feature id for the '<em><b>Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -957,7 +1023,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder() * @generated */ - public static final int XML_CONVERTERS_HOLDER = 15; + public static final int XML_CONVERTERS_HOLDER = 17; /** * The feature id for the '<em><b>Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1006,7 +1072,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping() * @generated */ - public static final int XML_CONVERTIBLE_MAPPING = 16; + public static final int XML_CONVERTIBLE_MAPPING = 18; /** * The feature id for the '<em><b>Lob</b></em>' attribute. * <!-- begin-user-doc --> @@ -1087,7 +1153,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy() * @generated */ - public static final int XML_COPY_POLICY = 17; + public static final int XML_COPY_POLICY = 19; /** * The feature id for the '<em><b>Class</b></em>' attribute. * <!-- begin-user-doc --> @@ -1112,7 +1178,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer() * @generated */ - public static final int XML_CUSTOMIZER = 18; + public static final int XML_CUSTOMIZER = 20; /** * The feature id for the '<em><b>Customizer Class Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -1137,7 +1203,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder() * @generated */ - public static final int XML_CUSTOMIZER_HOLDER = 19; + public static final int XML_CUSTOMIZER_HOLDER = 21; /** * The feature id for the '<em><b>Customizer</b></em>' containment reference. * <!-- begin-user-doc --> @@ -1162,7 +1228,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection() * @generated */ - public static final int XML_ELEMENT_COLLECTION = 20; + public static final int XML_ELEMENT_COLLECTION = 22; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -1428,13 +1494,37 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 12; /** + * The feature id for the '<em><b>Join Fetch</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION__JOIN_FETCH = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 13; + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION__BATCH_FETCH = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 14; + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 15; + /** * The number of structural features of the '<em>Xml Element Collection</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 13; + public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 16; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class. * <!-- begin-user-doc --> @@ -1443,7 +1533,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable() * @generated */ - public static final int XML_EMBEDDABLE = 21; + public static final int XML_EMBEDDABLE = 23; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -1485,13 +1575,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_EMBEDDABLE__ATTRIBUTES = OrmPackage.XML_EMBEDDABLE__ATTRIBUTES; /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDABLE__ACCESS_METHODS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Customizer</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CUSTOMIZER = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 0; + public static final int XML_EMBEDDABLE__CUSTOMIZER = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Change Tracking</b></em>' containment reference. * <!-- begin-user-doc --> @@ -1499,7 +1597,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CHANGE_TRACKING = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 1; + public static final int XML_EMBEDDABLE__CHANGE_TRACKING = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1507,7 +1605,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 2; + public static final int XML_EMBEDDABLE__CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Type Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1515,7 +1613,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 3; + public static final int XML_EMBEDDABLE__TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1523,7 +1621,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 4; + public static final int XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1531,7 +1629,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__STRUCT_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 5; + public static final int XML_EMBEDDABLE__STRUCT_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1539,7 +1637,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__PROPERTIES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 6; + public static final int XML_EMBEDDABLE__PROPERTIES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -1547,7 +1645,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 7; + public static final int XML_EMBEDDABLE__COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -1555,7 +1653,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 8; + public static final int XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -1563,7 +1661,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CLONE_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 9; + public static final int XML_EMBEDDABLE__CLONE_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute. * <!-- begin-user-doc --> @@ -1571,7 +1669,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 10; + public static final int XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 11; /** * The number of structural features of the '<em>Xml Embeddable</em>' class. * <!-- begin-user-doc --> @@ -1579,7 +1677,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDABLE_FEATURE_COUNT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 11; + public static final int XML_EMBEDDABLE_FEATURE_COUNT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 12; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class. * <!-- begin-user-doc --> @@ -1588,7 +1686,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded() * @generated */ - public static final int XML_EMBEDDED = 22; + public static final int XML_EMBEDDED = 24; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -1622,13 +1720,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_EMBEDDED__ASSOCIATION_OVERRIDES = OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES; /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDED__ATTRIBUTE_TYPE = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_EMBEDDED__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 0; + public static final int XML_EMBEDDED__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1636,7 +1742,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDED__PROPERTIES = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1; + public static final int XML_EMBEDDED__PROPERTIES = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Xml Embedded</em>' class. * <!-- begin-user-doc --> @@ -1644,7 +1750,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDED_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 2; + public static final int XML_EMBEDDED_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class. * <!-- begin-user-doc --> @@ -1653,7 +1759,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId() * @generated */ - public static final int XML_EMBEDDED_ID = 23; + public static final int XML_EMBEDDED_ID = 25; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -1679,13 +1785,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_EMBEDDED_ID__ATTRIBUTE_OVERRIDES = OrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_OVERRIDES; /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDED_ID__ATTRIBUTE_TYPE = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_EMBEDDED_ID__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 0; + public static final int XML_EMBEDDED_ID__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -1693,7 +1807,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDED_ID__PROPERTIES = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1; + public static final int XML_EMBEDDED_ID__PROPERTIES = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Xml Embedded Id</em>' class. * <!-- begin-user-doc --> @@ -1701,7 +1815,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_EMBEDDED_ID_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 2; + public static final int XML_EMBEDDED_ID_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class. * <!-- begin-user-doc --> @@ -1710,7 +1824,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity() * @generated */ - public static final int XML_ENTITY = 24; + public static final int XML_ENTITY = 26; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -1984,13 +2098,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ENTITY__QUERY_REDIRECTORS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 2; /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ENTITY__ACCESS_METHODS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 3; + /** * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ENTITY__FETCH_GROUPS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 3; + public static final int XML_ENTITY__FETCH_GROUPS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>Class Extractor</b></em>' containment reference. * <!-- begin-user-doc --> @@ -1998,7 +2120,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CLASS_EXTRACTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 4; + public static final int XML_ENTITY__CLASS_EXTRACTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Read Only</b></em>' attribute. * <!-- begin-user-doc --> @@ -2006,7 +2128,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 5; + public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Customizer</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2014,7 +2136,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6; + public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Change Tracking</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2022,7 +2144,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7; + public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Cache</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2030,7 +2152,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8; + public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>Existence Checking</b></em>' attribute. * <!-- begin-user-doc --> @@ -2038,7 +2160,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9; + public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2046,7 +2168,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10; + public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11; /** * The feature id for the '<em><b>Type Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2054,7 +2176,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11; + public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2062,7 +2184,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12; + public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2070,7 +2192,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13; + public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2078,7 +2200,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14; + public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2086,7 +2208,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15; + public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16; /** * The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2094,7 +2216,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16; + public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17; /** * The feature id for the '<em><b>Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2102,7 +2224,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17; + public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18; /** * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2110,7 +2232,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18; + public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19; /** * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2118,7 +2240,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19; + public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 20; /** * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute. * <!-- begin-user-doc --> @@ -2126,7 +2248,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 20; + public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 21; /** * The number of structural features of the '<em>Xml Entity</em>' class. * <!-- begin-user-doc --> @@ -2134,7 +2256,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 21; + public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 22; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class. * <!-- begin-user-doc --> @@ -2143,7 +2265,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings() * @generated */ - public static final int XML_ENTITY_MAPPINGS = 25; + public static final int XML_ENTITY_MAPPINGS = 27; /** * The feature id for the '<em><b>Version</b></em>' attribute. * <!-- begin-user-doc --> @@ -2328,7 +2450,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute() * @generated */ - public static final int XML_FETCH_ATTRIBUTE = 26; + public static final int XML_FETCH_ATTRIBUTE = 28; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -2353,7 +2475,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup() * @generated */ - public static final int XML_FETCH_GROUP = 27; + public static final int XML_FETCH_GROUP = 29; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -2386,7 +2508,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId() * @generated */ - public static final int XML_ID = 28; + public static final int XML_ID = 30; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -2460,13 +2582,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ID__GENERATED_VALUE = OrmPackage.XML_ID__GENERATED_VALUE; /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ID__ATTRIBUTE_TYPE = OrmPackage.XML_ID_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ID__ACCESS_METHODS = OrmPackage.XML_ID_FEATURE_COUNT + 0; + public static final int XML_ID__ACCESS_METHODS = OrmPackage.XML_ID_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2474,7 +2604,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__PROPERTIES = OrmPackage.XML_ID_FEATURE_COUNT + 1; + public static final int XML_ID__PROPERTIES = OrmPackage.XML_ID_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Mutable</b></em>' attribute. * <!-- begin-user-doc --> @@ -2482,7 +2612,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 2; + public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2490,7 +2620,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 3; + public static final int XML_ID__CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>Type Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2498,7 +2628,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 4; + public static final int XML_ID__TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2506,7 +2636,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 5; + public static final int XML_ID__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -2514,7 +2644,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__STRUCT_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 6; + public static final int XML_ID__STRUCT_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Convert</b></em>' attribute. * <!-- begin-user-doc --> @@ -2522,7 +2652,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 7; + public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 8; /** * The number of structural features of the '<em>Xml Id</em>' class. * <!-- begin-user-doc --> @@ -2530,7 +2660,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ID_FEATURE_COUNT = OrmPackage.XML_ID_FEATURE_COUNT + 8; + public static final int XML_ID_FEATURE_COUNT = OrmPackage.XML_ID_FEATURE_COUNT + 9; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy <em>Xml Instantiation Copy Policy</em>}' class. * <!-- begin-user-doc --> @@ -2539,7 +2669,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy() * @generated */ - public static final int XML_INSTANTIATION_COPY_POLICY = 29; + public static final int XML_INSTANTIATION_COPY_POLICY = 31; /** * The number of structural features of the '<em>Xml Instantiation Copy Policy</em>' class. * <!-- begin-user-doc --> @@ -2556,7 +2686,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch() * @generated */ - public static final int XML_JOIN_FETCH = 30; + public static final int XML_JOIN_FETCH = 32; /** * The feature id for the '<em><b>Join Fetch</b></em>' attribute. * <!-- begin-user-doc --> @@ -2581,7 +2711,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany() * @generated */ - public static final int XML_MANY_TO_MANY = 31; + public static final int XML_MANY_TO_MANY = 33; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -2711,77 +2841,93 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_MANY_TO_MANY__MAP_KEY = OrmPackage.XML_MANY_TO_MANY__MAP_KEY; /** - * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * 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__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 0; + public static final int XML_MANY_TO_MANY__CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Properties</b></em>' containment reference list. + * 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__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 1; + public static final int XML_MANY_TO_MANY__TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Join Fetch</b></em>' attribute. + * 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__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 2; + public static final int XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Converter</b></em>' containment reference. + * 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__CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3; + public static final int XML_MANY_TO_MANY__STRUCT_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Type Converter</b></em>' containment reference. + * 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__TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4; + public static final int XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. + * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. * <!-- 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; + public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. + * The feature id for the '<em><b>Batch Fetch</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; + public static final int XML_MANY_TO_MANY__BATCH_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list. + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. * <!-- 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 + 7; + public static final int XML_MANY_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 8; + /** + * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 8; + public static final int XML_MANY_TO_MANY__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 9; + /** + * The feature id for the '<em><b>Join Fetch</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 10; /** * The number of structural features of the '<em>Xml Many To Many</em>' class. * <!-- begin-user-doc --> @@ -2789,7 +2935,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 + 9; + public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 11; /** * 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 --> @@ -2798,7 +2944,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne() * @generated */ - public static final int XML_MANY_TO_ONE = 32; + public static final int XML_MANY_TO_ONE = 34; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -2880,13 +3026,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_MANY_TO_ONE__OPTIONAL = OrmPackage.XML_MANY_TO_ONE__OPTIONAL; /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_ONE__BATCH_FETCH = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MANY_TO_ONE__ACCESS_METHODS = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 0; + public static final int XML_MANY_TO_ONE__ACCESS_METHODS = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -2894,7 +3048,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MANY_TO_ONE__PROPERTIES = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 1; + public static final int XML_MANY_TO_ONE__PROPERTIES = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Join Fetch</b></em>' attribute. * <!-- begin-user-doc --> @@ -2902,7 +3056,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MANY_TO_ONE__JOIN_FETCH = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 2; + public static final int XML_MANY_TO_ONE__JOIN_FETCH = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 3; /** * The number of structural features of the '<em>Xml Many To One</em>' class. * <!-- begin-user-doc --> @@ -2910,7 +3064,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MANY_TO_ONE_FEATURE_COUNT = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 3; + public static final int XML_MANY_TO_ONE_FEATURE_COUNT = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 4; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class. * <!-- begin-user-doc --> @@ -2919,7 +3073,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass() * @generated */ - public static final int XML_MAPPED_SUPERCLASS = 33; + public static final int XML_MAPPED_SUPERCLASS = 35; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -3081,13 +3235,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 10; /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS__ACCESS_METHODS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 11; + /** * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 11; + public static final int XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3095,7 +3257,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 12; + public static final int XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Read Only</b></em>' attribute. * <!-- begin-user-doc --> @@ -3103,7 +3265,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13; + public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Customizer</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3111,7 +3273,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14; + public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15; /** * The feature id for the '<em><b>Change Tracking</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3119,7 +3281,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15; + public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16; /** * The feature id for the '<em><b>Cache</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3127,7 +3289,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16; + public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17; /** * The feature id for the '<em><b>Existence Checking</b></em>' attribute. * <!-- begin-user-doc --> @@ -3135,7 +3297,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17; + public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18; /** * The feature id for the '<em><b>Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -3143,7 +3305,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18; + public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 19; /** * The feature id for the '<em><b>Type Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -3151,7 +3313,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 19; + public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 20; /** * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -3159,7 +3321,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 20; + public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 21; /** * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -3167,7 +3329,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 21; + public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 22; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -3175,7 +3337,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 22; + public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 23; /** * The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3183,7 +3345,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 23; + public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 24; /** * The feature id for the '<em><b>Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3191,7 +3353,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 24; + public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 25; /** * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3199,7 +3361,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 25; + public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 26; /** * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference. * <!-- begin-user-doc --> @@ -3207,7 +3369,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 26; + public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 27; /** * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute. * <!-- begin-user-doc --> @@ -3215,7 +3377,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 27; + public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 28; /** * The number of structural features of the '<em>Xml Mapped Superclass</em>' class. * <!-- begin-user-doc --> @@ -3223,7 +3385,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 28; + public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 29; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class. * <!-- begin-user-doc --> @@ -3232,7 +3394,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable() * @generated */ - public static final int XML_MUTABLE = 34; + public static final int XML_MUTABLE = 36; /** * The feature id for the '<em><b>Mutable</b></em>' attribute. * <!-- begin-user-doc --> @@ -3257,7 +3419,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery() * @generated */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 36; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 38; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -3330,7 +3492,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter() * @generated */ - public static final int XML_OBJECT_TYPE_CONVERTER = 37; + public static final int XML_OBJECT_TYPE_CONVERTER = 39; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -3387,7 +3549,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany() * @generated */ - public static final int XML_ONE_TO_MANY = 38; + public static final int XML_ONE_TO_MANY = 40; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -3533,85 +3695,101 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ONE_TO_MANY__ORPHAN_REMOVAL = OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL; /** - * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * 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__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 0; + public static final int XML_ONE_TO_MANY__CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Properties</b></em>' containment reference list. + * 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__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 1; + public static final int XML_ONE_TO_MANY__TYPE_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Private Owned</b></em>' attribute. + * 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__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 2; + public static final int XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Join Fetch</b></em>' attribute. + * 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__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 3; + public static final int XML_ONE_TO_MANY__STRUCT_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Converter</b></em>' containment reference. + * 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__CONVERTER = 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 + 4; /** - * The feature id for the '<em><b>Type Converter</b></em>' containment reference. + * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. * <!-- 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; + public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. + * The feature id for the '<em><b>Batch Fetch</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; + public static final int XML_ONE_TO_MANY__BATCH_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. * <!-- 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; + public static final int XML_ONE_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list. + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- 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 + 8; + public static final int XML_ONE_TO_MANY__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 8; /** - * The feature id for the '<em><b>Map Key Convert</b></em>' attribute. + * The feature id for the '<em><b>Properties</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 9; + /** + * The feature id for the '<em><b>Private Owned</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 9; + public static final int XML_ONE_TO_MANY__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 10; + /** + * The feature id for the '<em><b>Join Fetch</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 11; /** * The number of structural features of the '<em>Xml One To Many</em>' class. * <!-- begin-user-doc --> @@ -3619,7 +3797,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 + 10; + public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 12; /** * 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 --> @@ -3628,7 +3806,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne() * @generated */ - public static final int XML_ONE_TO_ONE = 39; + public static final int XML_ONE_TO_ONE = 41; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -3734,13 +3912,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS = OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS; /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_ONE__BATCH_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 0; + public static final int XML_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -3748,7 +3934,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 1; + public static final int XML_ONE_TO_ONE__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Private Owned</b></em>' attribute. * <!-- begin-user-doc --> @@ -3756,7 +3942,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 2; + public static final int XML_ONE_TO_ONE__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Join Fetch</b></em>' attribute. * <!-- begin-user-doc --> @@ -3764,7 +3950,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 3; + public static final int XML_ONE_TO_ONE__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 4; /** * The number of structural features of the '<em>Xml One To One</em>' class. * <!-- begin-user-doc --> @@ -3772,7 +3958,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 4; + public static final int XML_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 5; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLocking <em>Xml Optimistic Locking</em>}' class. * <!-- begin-user-doc --> @@ -3781,7 +3967,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking() * @generated */ - public static final int XML_OPTIMISTIC_LOCKING = 40; + public static final int XML_OPTIMISTIC_LOCKING = 42; /** * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> @@ -3822,7 +4008,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn() * @generated */ - public static final int XML_ORDER_COLUMN = 41; + public static final int XML_ORDER_COLUMN = 43; /** * The feature id for the '<em><b>Column Definition</b></em>' attribute. * <!-- begin-user-doc --> @@ -3880,6 +4066,87 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ORDER_COLUMN_FEATURE_COUNT = OrmPackage.XML_ORDER_COLUMN_FEATURE_COUNT + 1; /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults() + * @generated + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 44; + /** + * The feature id for the '<em><b>Access</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS; + /** + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__DESCRIPTION = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__DESCRIPTION; + /** + * The feature id for the '<em><b>Delimited Identifiers</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__DELIMITED_IDENTIFIERS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__DELIMITED_IDENTIFIERS; + /** + * The feature id for the '<em><b>Schema</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA; + /** + * The feature id for the '<em><b>Catalog</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG; + /** + * The feature id for the '<em><b>Cascade Persist</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST; + /** + * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS; + /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 0; + /** + * The number of structural features of the '<em>Xml Persistence Unit Defaults</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 1; + /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3887,7 +4154,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata() * @generated */ - public static final int XML_PERSISTENCE_UNIT_METADATA = 42; + public static final int XML_PERSISTENCE_UNIT_METADATA = 45; /** * The feature id for the '<em><b>Description</b></em>' attribute. * <!-- begin-user-doc --> @@ -3936,7 +4203,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey() * @generated */ - public static final int XML_PRIMARY_KEY = 43; + public static final int XML_PRIMARY_KEY = 46; /** * The feature id for the '<em><b>Validation</b></em>' attribute. * <!-- begin-user-doc --> @@ -3977,7 +4244,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned() * @generated */ - public static final int XML_PRIVATE_OWNED = 44; + public static final int XML_PRIVATE_OWNED = 47; /** * The feature id for the '<em><b>Private Owned</b></em>' attribute. * <!-- begin-user-doc --> @@ -4002,7 +4269,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty() * @generated */ - public static final int XML_PROPERTY = 45; + public static final int XML_PROPERTY = 48; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -4043,7 +4310,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer() * @generated */ - public static final int XML_PROPERTY_CONTAINER = 46; + public static final int XML_PROPERTY_CONTAINER = 49; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -4068,7 +4335,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer() * @generated */ - public static final int XML_QUERY_CONTAINER = 47; + public static final int XML_QUERY_CONTAINER = 50; /** * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -4093,7 +4360,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors() * @generated */ - public static final int XML_QUERY_REDIRECTORS = 48; + public static final int XML_QUERY_REDIRECTORS = 51; /** * The feature id for the '<em><b>All Queries</b></em>' attribute. * <!-- begin-user-doc --> @@ -4166,7 +4433,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly() * @generated */ - public static final int XML_READ_ONLY = 49; + public static final int XML_READ_ONLY = 52; /** * The feature id for the '<em><b>Read Only</b></em>' attribute. * <!-- begin-user-doc --> @@ -4191,7 +4458,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert() * @generated */ - public static final int XML_RETURN_INSERT = 50; + public static final int XML_RETURN_INSERT = 53; /** * The feature id for the '<em><b>Return Only</b></em>' attribute. * <!-- begin-user-doc --> @@ -4216,7 +4483,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter() * @generated */ - public static final int XML_STORED_PROCEDURE_PARAMETER = 51; + public static final int XML_STORED_PROCEDURE_PARAMETER = 54; /** * The feature id for the '<em><b>Direction</b></em>' attribute. * <!-- begin-user-doc --> @@ -4281,7 +4548,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter() * @generated */ - public static final int XML_STRUCT_CONVERTER = 52; + public static final int XML_STRUCT_CONVERTER = 55; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -4314,7 +4581,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay() * @generated */ - public static final int XML_TIME_OF_DAY = 53; + public static final int XML_TIME_OF_DAY = 56; /** * The feature id for the '<em><b>Hour</b></em>' attribute. * <!-- begin-user-doc --> @@ -4363,7 +4630,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation() * @generated */ - public static final int XML_TRANSFORMATION = 54; + public static final int XML_TRANSFORMATION = 57; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -4381,13 +4648,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_TRANSFORMATION__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME; /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_TRANSFORMATION__ATTRIBUTE_TYPE = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_TRANSFORMATION__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0; + public static final int XML_TRANSFORMATION__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -4395,7 +4670,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_TRANSFORMATION__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1; + public static final int XML_TRANSFORMATION__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2; /** * The number of structural features of the '<em>Xml Transformation</em>' class. * <!-- begin-user-doc --> @@ -4403,7 +4678,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_TRANSFORMATION_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2; + public static final int XML_TRANSFORMATION_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class. * <!-- begin-user-doc --> @@ -4412,7 +4687,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransient() * @generated */ - public static final int XML_TRANSIENT = 55; + public static final int XML_TRANSIENT = 58; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -4461,7 +4736,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter() * @generated */ - public static final int XML_TYPE_CONVERTER = 56; + public static final int XML_TYPE_CONVERTER = 59; /** * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> @@ -4502,7 +4777,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne() * @generated */ - public static final int XML_VARIABLE_ONE_TO_ONE = 57; + public static final int XML_VARIABLE_ONE_TO_ONE = 60; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -4551,7 +4826,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion() * @generated */ - public static final int XML_VERSION = 58; + public static final int XML_VERSION = 61; /** * The feature id for the '<em><b>Access</b></em>' attribute. * <!-- begin-user-doc --> @@ -4601,13 +4876,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_VERSION__ENUMERATED = OrmPackage.XML_VERSION__ENUMERATED; /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_VERSION__ATTRIBUTE_TYPE = OrmPackage.XML_VERSION_FEATURE_COUNT + 0; + /** * The feature id for the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_VERSION__ACCESS_METHODS = OrmPackage.XML_VERSION_FEATURE_COUNT + 0; + public static final int XML_VERSION__ACCESS_METHODS = OrmPackage.XML_VERSION_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Properties</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -4615,7 +4898,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__PROPERTIES = OrmPackage.XML_VERSION_FEATURE_COUNT + 1; + public static final int XML_VERSION__PROPERTIES = OrmPackage.XML_VERSION_FEATURE_COUNT + 2; /** * The feature id for the '<em><b>Mutable</b></em>' attribute. * <!-- begin-user-doc --> @@ -4623,7 +4906,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__MUTABLE = OrmPackage.XML_VERSION_FEATURE_COUNT + 2; + public static final int XML_VERSION__MUTABLE = OrmPackage.XML_VERSION_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -4631,7 +4914,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 3; + public static final int XML_VERSION__CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 4; /** * The feature id for the '<em><b>Type Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -4639,7 +4922,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 4; + public static final int XML_VERSION__TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -4647,7 +4930,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 5; + public static final int XML_VERSION__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 6; /** * The feature id for the '<em><b>Struct Converter</b></em>' containment reference. * <!-- begin-user-doc --> @@ -4655,7 +4938,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__STRUCT_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 6; + public static final int XML_VERSION__STRUCT_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 7; /** * The feature id for the '<em><b>Convert</b></em>' attribute. * <!-- begin-user-doc --> @@ -4663,7 +4946,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION__CONVERT = OrmPackage.XML_VERSION_FEATURE_COUNT + 7; + public static final int XML_VERSION__CONVERT = OrmPackage.XML_VERSION_FEATURE_COUNT + 8; /** * The number of structural features of the '<em>Xml Version</em>' class. * <!-- begin-user-doc --> @@ -4671,7 +4954,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_VERSION_FEATURE_COUNT = OrmPackage.XML_VERSION_FEATURE_COUNT + 8; + public static final int XML_VERSION_FEATURE_COUNT = OrmPackage.XML_VERSION_FEATURE_COUNT + 9; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}' enum. * <!-- begin-user-doc --> @@ -4680,7 +4963,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType() * @generated */ - public static final int CACHE_COORDINATION_TYPE = 59; + public static final int CACHE_COORDINATION_TYPE = 62; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}' enum. * <!-- begin-user-doc --> @@ -4689,7 +4972,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType() * @generated */ - public static final int CACHE_TYPE = 60; + public static final int CACHE_TYPE = 63; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}' enum. * <!-- begin-user-doc --> @@ -4698,7 +4981,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType() * @generated */ - public static final int XML_CHANGE_TRACKING_TYPE = 61; + public static final int XML_CHANGE_TRACKING_TYPE = 64; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}' enum. * <!-- begin-user-doc --> @@ -4707,7 +4990,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection() * @generated */ - public static final int XML_DIRECTION = 62; + public static final int XML_DIRECTION = 65; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum. * <!-- begin-user-doc --> @@ -4716,7 +4999,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType() * @generated */ - public static final int EXISTENCE_TYPE = 63; + public static final int EXISTENCE_TYPE = 66; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum. * <!-- begin-user-doc --> @@ -4725,7 +5008,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType() * @generated */ - public static final int XML_JOIN_FETCH_TYPE = 64; + public static final int XML_JOIN_FETCH_TYPE = 67; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}' enum. * <!-- begin-user-doc --> @@ -4734,7 +5017,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType() * @generated */ - public static final int XML_OPTIMISTIC_LOCKING_TYPE = 65; + public static final int XML_OPTIMISTIC_LOCKING_TYPE = 68; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4782,6 +5065,18 @@ public class EclipseLinkOrmPackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlBatchFetchEClass = null; + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlBatchFetchHolderEClass = null; + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlCacheEClass = null; /** * <!-- begin-user-doc --> @@ -4992,6 +5287,12 @@ public class EclipseLinkOrmPackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlPersistenceUnitDefaultsEClass = null; + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlPersistenceUnitMetadataEClass = null; /** * <!-- begin-user-doc --> @@ -5401,6 +5702,46 @@ public class EclipseLinkOrmPackage extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch <em>Xml Batch Fetch</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Batch Fetch</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch + * @generated + */ + public EClass getXmlBatchFetch() + { + return xmlBatchFetchEClass; + } + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder <em>Xml Batch Fetch Holder</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Batch Fetch Holder</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder + * @generated + */ + public EClass getXmlBatchFetchHolder() + { + return xmlBatchFetchHolderEClass; + } + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch <em>Batch Fetch</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Batch Fetch</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch() + * @see #getXmlBatchFetchHolder() + * @generated + */ + public EReference getXmlBatchFetchHolder_BatchFetch() + { + return (EReference)xmlBatchFetchHolderEClass.getEStructuralFeatures().get(0); + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -6710,6 +7051,19 @@ public class EclipseLinkOrmPackage extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Persistence Unit Defaults</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults + * @generated + */ + public EClass getXmlPersistenceUnitDefaults() + { + return xmlPersistenceUnitDefaultsEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -7368,6 +7722,11 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlBasicMapEClass = createEClass(XML_BASIC_MAP); + xmlBatchFetchEClass = createEClass(XML_BATCH_FETCH); + + xmlBatchFetchHolderEClass = createEClass(XML_BATCH_FETCH_HOLDER); + createEReference(xmlBatchFetchHolderEClass, XML_BATCH_FETCH_HOLDER__BATCH_FETCH); + xmlCacheEClass = createEClass(XML_CACHE); createEAttribute(xmlCacheEClass, XML_CACHE__EXPIRY); createEAttribute(xmlCacheEClass, XML_CACHE__SIZE); @@ -7499,6 +7858,8 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlOrderColumnEClass = createEClass(XML_ORDER_COLUMN); + xmlPersistenceUnitDefaultsEClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS); + xmlPersistenceUnitMetadataEClass = createEClass(XML_PERSISTENCE_UNIT_METADATA); createEAttribute(xmlPersistenceUnitMetadataEClass, XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS); @@ -7610,27 +7971,32 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlAttributeMappingEClass.getESuperTypes().add(this.getXmlPropertyContainer()); attributesEClass.getESuperTypes().add(theOrmPackage.getAttributes()); xmlBasicEClass.getESuperTypes().add(theOrmPackage.getXmlBasic()); + xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlBasic_2_1()); xmlBasicEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlBasicEClass.getESuperTypes().add(this.getXmlMutable()); xmlBasicEClass.getESuperTypes().add(this.getXmlConvertibleMapping()); - xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlBasic_2_1()); xmlBasicCollectionEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlBasicCollectionEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlBasicMapEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlBasicMapEClass.getESuperTypes().add(this.getXmlAttributeMapping()); + xmlBatchFetchEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlBatchFetch_2_1()); xmlConverterEClass.getESuperTypes().add(this.getXmlNamedConverter()); xmlConvertibleMappingEClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping()); xmlConvertibleMappingEClass.getESuperTypes().add(this.getXmlConverterHolder()); xmlElementCollectionEClass.getESuperTypes().add(theOrmPackage.getXmlElementCollection()); xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlElementCollection_2_0()); + xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlElementCollection_2_1()); xmlEmbeddableEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddable()); + xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEmbeddable_2_1()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlCustomizerHolder()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlConvertersHolder()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlPropertyContainer()); xmlEmbeddedEClass.getESuperTypes().add(theOrmPackage.getXmlEmbedded()); + xmlEmbeddedEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEmbedded_2_1()); xmlEmbeddedEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlEmbeddedIdEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedId()); + xmlEmbeddedIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEmbeddedId_2_1()); xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlEntityEClass.getESuperTypes().add(theOrmPackage.getXmlEntity()); xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlEntity_1_1()); @@ -7649,14 +8015,17 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlFetchAttributeEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchAttribute_2_1()); xmlFetchGroupEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchGroup_2_1()); xmlIdEClass.getESuperTypes().add(theOrmPackage.getXmlId()); + xmlIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlId_2_1()); xmlIdEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlIdEClass.getESuperTypes().add(this.getXmlMutable()); xmlIdEClass.getESuperTypes().add(this.getXmlConvertibleMapping()); xmlManyToManyEClass.getESuperTypes().add(theOrmPackage.getXmlManyToMany()); + xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlManyToMany_2_0()); + xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlManyToMany_2_1()); xmlManyToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlManyToManyEClass.getESuperTypes().add(this.getXmlJoinFetch()); - xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlManyToMany_2_0()); xmlManyToOneEClass.getESuperTypes().add(theOrmPackage.getXmlManyToOne()); + xmlManyToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlManyToOne_2_1()); xmlManyToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlManyToOneEClass.getESuperTypes().add(this.getXmlJoinFetch()); xmlMappedSuperclassEClass.getESuperTypes().add(theOrmPackage.getXmlMappedSuperclass()); @@ -7671,16 +8040,20 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlPropertyContainer()); xmlObjectTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter()); xmlOneToManyEClass.getESuperTypes().add(theOrmPackage.getXmlOneToMany()); + xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOneToMany_2_0()); + xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlOneToMany_2_1()); xmlOneToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlOneToManyEClass.getESuperTypes().add(this.getXmlPrivateOwned()); xmlOneToManyEClass.getESuperTypes().add(this.getXmlJoinFetch()); - xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOneToMany_2_0()); xmlOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOne()); + xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlOneToOne_2_1()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlPrivateOwned()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlJoinFetch()); xmlOrderColumnEClass.getESuperTypes().add(theOrmPackage.getXmlOrderColumn()); xmlOrderColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOrderColumn_2_0()); + xmlPersistenceUnitDefaultsEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitDefaults()); + xmlPersistenceUnitDefaultsEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlPersistenceUnitDefaults_2_1()); xmlPersistenceUnitMetadataEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitMetadata()); xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlPrimaryKey_1_1()); xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlPrimaryKey_2_1()); @@ -7688,6 +8061,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlReturnInsertEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlReturnInsert_2_1()); xmlStructConverterEClass.getESuperTypes().add(this.getXmlNamedConverter()); xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); + xmlTransformationEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlTransformation_2_1()); xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlTransientEClass.getESuperTypes().add(theOrmPackage.getXmlTransient()); xmlTransientEClass.getESuperTypes().add(this.getXmlAttributeMapping()); @@ -7695,6 +8069,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlVariableOneToOneEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlVariableOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlVersionEClass.getESuperTypes().add(theOrmPackage.getXmlVersion()); + xmlVersionEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlVersion_2_1()); xmlVersionEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlVersionEClass.getESuperTypes().add(this.getXmlMutable()); xmlVersionEClass.getESuperTypes().add(this.getXmlConvertibleMapping()); @@ -7721,6 +8096,11 @@ public class EclipseLinkOrmPackage extends EPackageImpl initEClass(xmlBasicMapEClass, XmlBasicMap.class, "XmlBasicMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlBatchFetchEClass, XmlBatchFetch.class, "XmlBatchFetch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(xmlBatchFetchHolderEClass, XmlBatchFetchHolder.class, "XmlBatchFetchHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlBatchFetchHolder_BatchFetch(), this.getXmlBatchFetch(), null, "batchFetch", null, 0, 1, XmlBatchFetchHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlCacheEClass, XmlCache.class, "XmlCache", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlCache_Expiry(), theXMLTypePackage.getIntObject(), "expiry", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlCache_Size(), theXMLTypePackage.getIntObject(), "size", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -7852,6 +8232,8 @@ public class EclipseLinkOrmPackage extends EPackageImpl initEClass(xmlOrderColumnEClass, XmlOrderColumn.class, "XmlOrderColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlPersistenceUnitDefaultsEClass, XmlPersistenceUnitDefaults.class, "XmlPersistenceUnitDefaults", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlPersistenceUnitMetadataEClass, XmlPersistenceUnitMetadata.class, "XmlPersistenceUnitMetadata", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlPersistenceUnitMetadata_ExcludeDefaultMappings(), theXMLTypePackage.getBoolean(), "excludeDefaultMappings", null, 0, 1, XmlPersistenceUnitMetadata.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -8096,6 +8478,34 @@ public class EclipseLinkOrmPackage extends EPackageImpl public static final EClass XML_BASIC_MAP = eINSTANCE.getXmlBasicMap(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch <em>Xml Batch Fetch</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch() + * @generated + */ + public static final EClass XML_BATCH_FETCH = eINSTANCE.getXmlBatchFetch(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder <em>Xml Batch Fetch Holder</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder() + * @generated + */ + public static final EClass XML_BATCH_FETCH_HOLDER = eINSTANCE.getXmlBatchFetchHolder(); + + /** + * The meta object literal for the '<em><b>Batch Fetch</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EReference XML_BATCH_FETCH_HOLDER__BATCH_FETCH = eINSTANCE.getXmlBatchFetchHolder_BatchFetch(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -8934,6 +9344,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl public static final EClass XML_ORDER_COLUMN = eINSTANCE.getXmlOrderColumn(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults() + * @generated + */ + public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getXmlPersistenceUnitDefaults(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.java index 02e0979123..102b94b6a6 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlAccessMethods.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. @@ -22,6 +22,13 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Access Methods</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * * <!-- end-user-doc --> * * <p> @@ -268,7 +275,12 @@ public class XmlAccessMethods extends AbstractJpaEObject implements JpaEObject // ********** translators ********** public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { - return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren()); + return new SimpleTranslator( + elementName, + structuralFeature, + Translator.END_TAG_NO_INDENT, + buildTranslatorChildren() + ); } private static Translator[] buildTranslatorChildren() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java index dde72c1935..56b22324d6 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java @@ -46,7 +46,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -56,154 +56,172 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic implements XmlAttributeMapping, XmlMutable, XmlConvertibleMapping, XmlBasic_2_1 +public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic implements XmlBasic_2_1, XmlAttributeMapping, XmlMutable, XmlConvertibleMapping { /** - * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAccessMethods() + * @see #getSequenceGenerator() * @generated * @ordered */ - protected XmlAccessMethods accessMethods; + protected XmlSequenceGenerator sequenceGenerator; /** - * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. + * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getProperties() + * @see #getTableGenerator() * @generated * @ordered */ - protected EList<XmlProperty> properties; + protected XmlTableGenerator tableGenerator; /** - * The default value of the '{@link #getMutable() <em>Mutable</em>}' attribute. + * The cached value of the '{@link #getGeneratedValue() <em>Generated Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMutable() + * @see #getGeneratedValue() * @generated * @ordered */ - protected static final Boolean MUTABLE_EDEFAULT = null; + protected XmlGeneratedValue generatedValue; + /** - * The cached value of the '{@link #getMutable() <em>Mutable</em>}' attribute. + * The cached value of the '{@link #getReturnInsert() <em>Return Insert</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMutable() + * @see #getReturnInsert() * @generated * @ordered */ - protected Boolean mutable = MUTABLE_EDEFAULT; + protected XmlReturnInsert returnInsert; /** - * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. + * The default value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConverter() + * @see #getReturnUpdate() * @generated * @ordered */ - protected XmlConverter converter; + protected static final Boolean RETURN_UPDATE_EDEFAULT = null; /** - * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. + * The cached value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTypeConverter() + * @see #getReturnUpdate() * @generated * @ordered */ - protected XmlTypeConverter typeConverter; + protected Boolean returnUpdate = RETURN_UPDATE_EDEFAULT; + /** - * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getObjectTypeConverter() + * @see #getAttributeType() * @generated * @ordered */ - protected XmlObjectTypeConverter objectTypeConverter; + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; /** - * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getStructConverter() + * @see #getAttributeType() * @generated * @ordered */ - protected XmlStructConverter structConverter; + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; /** - * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute. + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConvert() + * @see #getAccessMethods() * @generated * @ordered */ - protected static final String CONVERT_EDEFAULT = null; + protected XmlAccessMethods accessMethods; /** - * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute. + * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConvert() + * @see #getProperties() * @generated * @ordered */ - protected String convert = CONVERT_EDEFAULT; - + protected EList<XmlProperty> properties; /** - * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference. + * The default value of the '{@link #getMutable() <em>Mutable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getSequenceGenerator() + * @see #getMutable() * @generated * @ordered */ - protected XmlSequenceGenerator sequenceGenerator; + protected static final Boolean MUTABLE_EDEFAULT = null; /** - * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference. + * The cached value of the '{@link #getMutable() <em>Mutable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTableGenerator() + * @see #getMutable() * @generated * @ordered */ - protected XmlTableGenerator tableGenerator; + protected Boolean mutable = MUTABLE_EDEFAULT; /** - * The cached value of the '{@link #getGeneratedValue() <em>Generated Value</em>}' containment reference. + * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getGeneratedValue() + * @see #getConverter() * @generated * @ordered */ - protected XmlGeneratedValue generatedValue; - + protected XmlConverter converter; /** - * The cached value of the '{@link #getReturnInsert() <em>Return Insert</em>}' containment reference. + * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getReturnInsert() + * @see #getTypeConverter() * @generated * @ordered */ - protected XmlReturnInsert returnInsert; + protected XmlTypeConverter typeConverter; /** - * The default value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute. + * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getReturnUpdate() + * @see #getObjectTypeConverter() * @generated * @ordered */ - protected static final Boolean RETURN_UPDATE_EDEFAULT = null; + protected XmlObjectTypeConverter objectTypeConverter; /** - * The cached value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute. + * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getReturnUpdate() + * @see #getStructConverter() * @generated * @ordered */ - protected Boolean returnUpdate = RETURN_UPDATE_EDEFAULT; + protected XmlStructConverter structConverter; + /** + * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getConvert() + * @generated + * @ordered + */ + protected static final String CONVERT_EDEFAULT = null; + /** + * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getConvert() + * @generated + * @ordered + */ + protected String convert = CONVERT_EDEFAULT; /** * <!-- begin-user-doc --> @@ -572,6 +590,41 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme } /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -904,6 +957,14 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme { switch (featureID) { + case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: + return basicSetSequenceGenerator(null, msgs); + case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: + return basicSetTableGenerator(null, msgs); + case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: + return basicSetGeneratedValue(null, msgs); + case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: + return basicSetReturnInsert(null, msgs); case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: @@ -916,14 +977,6 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme return basicSetObjectTypeConverter(null, msgs); case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER: return basicSetStructConverter(null, msgs); - case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: - return basicSetSequenceGenerator(null, msgs); - case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: - return basicSetTableGenerator(null, msgs); - case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: - return basicSetGeneratedValue(null, msgs); - case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: - return basicSetReturnInsert(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -938,6 +991,18 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme { switch (featureID) { + case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: + return getSequenceGenerator(); + case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: + return getTableGenerator(); + case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: + return getGeneratedValue(); + case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: + return getReturnInsert(); + case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: + return getReturnUpdate(); + case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE: + return getAttributeType(); case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: @@ -954,16 +1019,6 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme return getStructConverter(); case EclipseLinkOrmPackage.XML_BASIC__CONVERT: return getConvert(); - case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: - return getSequenceGenerator(); - case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: - return getTableGenerator(); - case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: - return getGeneratedValue(); - case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: - return getReturnInsert(); - case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: - return getReturnUpdate(); } return super.eGet(featureID, resolve, coreType); } @@ -979,6 +1034,24 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme { switch (featureID) { + case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: + setSequenceGenerator((XmlSequenceGenerator)newValue); + return; + case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: + setTableGenerator((XmlTableGenerator)newValue); + return; + case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: + setGeneratedValue((XmlGeneratedValue)newValue); + return; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: + setReturnInsert((XmlReturnInsert)newValue); + return; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: + setReturnUpdate((Boolean)newValue); + return; + case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -1004,21 +1077,6 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme case EclipseLinkOrmPackage.XML_BASIC__CONVERT: setConvert((String)newValue); return; - case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: - setSequenceGenerator((XmlSequenceGenerator)newValue); - return; - case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: - setTableGenerator((XmlTableGenerator)newValue); - return; - case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: - setGeneratedValue((XmlGeneratedValue)newValue); - return; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: - setReturnInsert((XmlReturnInsert)newValue); - return; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: - setReturnUpdate((Boolean)newValue); - return; } super.eSet(featureID, newValue); } @@ -1033,6 +1091,24 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme { switch (featureID) { + case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: + setSequenceGenerator((XmlSequenceGenerator)null); + return; + case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: + setTableGenerator((XmlTableGenerator)null); + return; + case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: + setGeneratedValue((XmlGeneratedValue)null); + return; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: + setReturnInsert((XmlReturnInsert)null); + return; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: + setReturnUpdate(RETURN_UPDATE_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -1057,21 +1133,6 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme case EclipseLinkOrmPackage.XML_BASIC__CONVERT: setConvert(CONVERT_EDEFAULT); return; - case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: - setSequenceGenerator((XmlSequenceGenerator)null); - return; - case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: - setTableGenerator((XmlTableGenerator)null); - return; - case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: - setGeneratedValue((XmlGeneratedValue)null); - return; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: - setReturnInsert((XmlReturnInsert)null); - return; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: - setReturnUpdate(RETURN_UPDATE_EDEFAULT); - return; } super.eUnset(featureID); } @@ -1086,6 +1147,18 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme { switch (featureID) { + case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: + return sequenceGenerator != null; + case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: + return tableGenerator != null; + case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: + return generatedValue != null; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: + return returnInsert != null; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: + return RETURN_UPDATE_EDEFAULT == null ? returnUpdate != null : !RETURN_UPDATE_EDEFAULT.equals(returnUpdate); + case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: @@ -1102,16 +1175,6 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme return structConverter != null; case EclipseLinkOrmPackage.XML_BASIC__CONVERT: return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert); - case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: - return sequenceGenerator != null; - case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: - return tableGenerator != null; - case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: - return generatedValue != null; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: - return returnInsert != null; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: - return RETURN_UPDATE_EDEFAULT == null ? returnUpdate != null : !RETURN_UPDATE_EDEFAULT.equals(returnUpdate); } return super.eIsSet(featureID); } @@ -1124,79 +1187,80 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) + if (baseClass == XmlGeneratorContainer.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR; + case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR; default: return -1; } } - if (baseClass == XmlPropertyContainer.class) + if (baseClass == XmlBasic_1_1.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES; + case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: return EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE; default: return -1; } } - if (baseClass == XmlAttributeMapping.class) + if (baseClass == XmlBasic_2_1.class) { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT; + case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE; + case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_BASIC_21__ATTRIBUTE_TYPE; default: return -1; } } - if (baseClass == XmlMutable.class) + if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE; + case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlConverterHolder.class) + if (baseClass == XmlPropertyContainer.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER; - case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER; - case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER; - case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER; + case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES; default: return -1; } } - if (baseClass == XmlConvertibleMapping.class) + if (baseClass == XmlAttributeMapping.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT; default: return -1; } } - if (baseClass == XmlGeneratorContainer.class) + if (baseClass == XmlMutable.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR; - case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR; + case EclipseLinkOrmPackage.XML_BASIC__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE; default: return -1; } } - if (baseClass == XmlBasic_1_1.class) + if (baseClass == XmlConverterHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: return EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE; + case EclipseLinkOrmPackage.XML_BASIC__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER; + case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER; default: return -1; } } - if (baseClass == XmlBasic_2_1.class) + if (baseClass == XmlConvertibleMapping.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT; - case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE; + case EclipseLinkOrmPackage.XML_BASIC__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT; default: return -1; } } @@ -1211,79 +1275,80 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) + if (baseClass == XmlGeneratorContainer.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS; + case OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR; + case OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR; default: return -1; } } - if (baseClass == XmlPropertyContainer.class) + if (baseClass == XmlBasic_1_1.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC__PROPERTIES; + case EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE: return EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE; default: return -1; } } - if (baseClass == XmlAttributeMapping.class) + if (baseClass == XmlBasic_2_1.class) { switch (baseFeatureID) { + case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT: return EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT; + case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE: return EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE; + case EclipseLinkOrmV2_1Package.XML_BASIC_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE; default: return -1; } } - if (baseClass == XmlMutable.class) + if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_BASIC__MUTABLE; + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlConverterHolder.class) + if (baseClass == XmlPropertyContainer.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__CONVERTER; - case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER; - case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER; - case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER; + case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC__PROPERTIES; default: return -1; } } - if (baseClass == XmlConvertibleMapping.class) + if (baseClass == XmlAttributeMapping.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_BASIC__CONVERT; default: return -1; } } - if (baseClass == XmlGeneratorContainer.class) + if (baseClass == XmlMutable.class) { switch (baseFeatureID) { - case OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR; - case OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR; + case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_BASIC__MUTABLE; default: return -1; } } - if (baseClass == XmlBasic_1_1.class) + if (baseClass == XmlConverterHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE: return EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER; + case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER; default: return -1; } } - if (baseClass == XmlBasic_2_1.class) + if (baseClass == XmlConvertibleMapping.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT: return EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT; - case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE: return EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE; + case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_BASIC__CONVERT; default: return -1; } } @@ -1301,12 +1366,14 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (mutable: "); + result.append(" (returnUpdate: "); + result.append(returnUpdate); + result.append(", attributeType: "); + result.append(attributeType); + result.append(", mutable: "); result.append(mutable); result.append(", convert: "); result.append(convert); - result.append(", returnUpdate: "); - result.append(returnUpdate); result.append(')'); return result.toString(); } @@ -1336,6 +1403,7 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme buildOptionalTranslator(), buildAccessTranslator(), buildMutableTranslator(), + buildAttributeTypeTranslator(), buildColumnTranslator(), buildGeneratedValueTranslator(), buildLobTranslator(), @@ -1405,4 +1473,9 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme protected static Translator buildReturnUpdateTranslator() { return new Translator(EclipseLink2_1.RETURN_UPDATE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_ReturnUpdate()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBatchFetch.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBatchFetch.java new file mode 100644 index 0000000000..02976c25d9 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBatchFetch.java @@ -0,0 +1,300 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject; + +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1; +import org.eclipse.wst.common.internal.emf.resource.Translator; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xm Batch Fetch</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch() + * @model kind="class" + * @generated + */ +public class XmlBatchFetch extends AbstractJpaEObject implements XmlBatchFetch_2_1 +{ + /** + * The default value of the '{@link #getSize() <em>Size</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSize() + * @generated + * @ordered + */ + protected static final Integer SIZE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSize() <em>Size</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSize() + * @generated + * @ordered + */ + protected Integer size = SIZE_EDEFAULT; + + /** + * changed this to null and removed the generated flag so emf won't generate over it + * we don't want a default for enums, just null if the tag does not exist + */ + protected static final BatchFetchType_2_1 BATCH_FETCH_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getBatchFetchType() <em>Batch Fetch Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getBatchFetchType() + * @generated + * @ordered + */ + protected BatchFetchType_2_1 batchFetchType = BATCH_FETCH_TYPE_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected XmlBatchFetch() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_BATCH_FETCH; + } + + /** + * Returns the value of the '<em><b>Size</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Size</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Size</em>' attribute. + * @see #setSize(Integer) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch_2_1_Size() + * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" + * @generated + */ + public Integer getSize() + { + return size; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch#getSize <em>Size</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Size</em>' attribute. + * @see #getSize() + * @generated + */ + public void setSize(Integer newSize) + { + Integer oldSize = size; + size = newSize; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE, oldSize, size)); + } + + /** + * Returns the value of the '<em><b>Batch Fetch Type</b></em>' attribute. + * The literals are from the enumeration {@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Batch Fetch Type</em>' attribute. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @see #setBatchFetchType(BatchFetchType_2_1) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch_2_1_BatchFetchType() + * @model + * @generated + */ + public BatchFetchType_2_1 getBatchFetchType() + { + return batchFetchType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetch#getBatchFetchType <em>Batch Fetch Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch Type</em>' attribute. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @see #getBatchFetchType() + * @generated + */ + public void setBatchFetchType(BatchFetchType_2_1 newBatchFetchType) + { + BatchFetchType_2_1 oldBatchFetchType = batchFetchType; + batchFetchType = newBatchFetchType == null ? BATCH_FETCH_TYPE_EDEFAULT : newBatchFetchType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE, oldBatchFetchType, batchFetchType)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE: + return getSize(); + case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE: + return getBatchFetchType(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE: + setSize((Integer)newValue); + return; + case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE: + setBatchFetchType((BatchFetchType_2_1)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE: + setSize(SIZE_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE: + setBatchFetchType(BATCH_FETCH_TYPE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE: + return SIZE_EDEFAULT == null ? size != null : !SIZE_EDEFAULT.equals(size); + case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE: + return batchFetchType != BATCH_FETCH_TYPE_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (size: "); + result.append(size); + result.append(", batchFetchType: "); + result.append(batchFetchType); + result.append(')'); + return result.toString(); + } + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + Translator.END_TAG_NO_INDENT, + buildTranslatorChildren() + ); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildSizeTranslator(), + buildBatchFetchTypeTranslator(), + }; + } + + protected static Translator buildSizeTranslator() { + return new Translator(EclipseLink2_1.BATCH_FETCH__SIZE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBatchFetch_2_1_Size(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildBatchFetchTypeTranslator() { + return new Translator(EclipseLink2_1.BATCH_FETCH__TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBatchFetch_2_1_BatchFetchType(), Translator.DOM_ATTRIBUTE); + } + +} // XmBatchFetch diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBatchFetchHolder.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBatchFetchHolder.java new file mode 100644 index 0000000000..db8b0a8f39 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBatchFetchHolder.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Batch Fetch Holder</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch <em>Batch Fetch</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlBatchFetchHolder extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference. + * @see #setBatchFetch(XmlBatchFetch) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch() + * @model containment="true" + * @generated + */ + XmlBatchFetch getBatchFetch(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch</em>' containment reference. + * @see #getBatchFetch() + * @generated + */ + void setBatchFetch(XmlBatchFetch value); + +} // XmlBatchFetchHolder diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java index 7c1944d1b4..0cec193b8d 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlCustomizer.java @@ -1,9 +1,12 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; @@ -18,6 +21,15 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Customizer</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.1 + * @since 2.1 * <!-- end-user-doc --> * * <p> 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 d72be228f5..6560b955e1 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 @@ -35,11 +35,23 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Pack 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.XmlMapKeyAssociationOverrideContainer_2_0; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1; import org.eclipse.wst.common.internal.emf.resource.Translator; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Element Collection</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.1 * <!-- end-user-doc --> * * @@ -47,7 +59,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlElementCollection implements XmlElementCollection_2_0 +public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlElementCollection implements XmlElementCollection_2_0, XmlElementCollection_2_1 { /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. @@ -200,6 +212,52 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT; /** + * changed this to null and removed the generated flag so emf won't generate over it + * we don't want a default for enums, just null if the tag does not exist + */ + protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null; + + /** + * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getJoinFetch() + * @generated + * @ordered + */ + protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; + + /** + * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getBatchFetch() + * @generated + * @ordered + */ + protected XmlBatchFetch batchFetch; + + /** + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -729,6 +787,139 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE } /** + * Returns the value of the '<em><b>Join Fetch</b></em>' attribute. + * The literals are from the enumeration {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Join Fetch</em>' attribute. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType + * @see #setJoinFetch(XmlJoinFetchType) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch() + * @model + * @generated + */ + public XmlJoinFetchType getJoinFetch() + { + return joinFetch; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlElementCollection#getJoinFetch <em>Join Fetch</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Join Fetch</em>' attribute. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType + * @see #getJoinFetch() + * @generated + */ + public void setJoinFetch(XmlJoinFetchType newJoinFetch) + { + XmlJoinFetchType oldJoinFetch = joinFetch; + joinFetch = newJoinFetch == null ? JOIN_FETCH_EDEFAULT : newJoinFetch; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH, oldJoinFetch, joinFetch)); + } + + /** + * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference. + * @see #setBatchFetch(XmlBatchFetch) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch() + * @model containment="true" + * @generated + */ + public XmlBatchFetch getBatchFetch() + { + return batchFetch; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs) + { + XmlBatchFetch oldBatchFetch = batchFetch; + batchFetch = newBatchFetch; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, oldBatchFetch, newBatchFetch); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlElementCollection#getBatchFetch <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch</em>' containment reference. + * @see #getBatchFetch() + * @generated + */ + public void setBatchFetch(XmlBatchFetch newBatchFetch) + { + if (newBatchFetch != batchFetch) + { + NotificationChain msgs = null; + if (batchFetch != null) + msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, null, msgs); + if (newBatchFetch != null) + msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, null, msgs); + msgs = basicSetBatchFetch(newBatchFetch, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, newBatchFetch, newBatchFetch)); + } + + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlElementCollection#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -760,6 +951,8 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES: return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: + return basicSetBatchFetch(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -800,6 +993,12 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE return getMapKeyAssociationOverrides(); case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT: return getMapKeyConvert(); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH: + return getJoinFetch(); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: + return getBatchFetch(); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE: + return getAttributeType(); } return super.eGet(featureID, resolve, coreType); } @@ -860,6 +1059,15 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT: setMapKeyConvert((String)newValue); return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH: + setJoinFetch((XmlJoinFetchType)newValue); + return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)newValue); + return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -913,6 +1121,15 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT: setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH: + setJoinFetch(JOIN_FETCH_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)null); + return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; } super.eUnset(featureID); } @@ -953,6 +1170,12 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty(); case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT: return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH: + return joinFetch != JOIN_FETCH_EDEFAULT; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: + return batchFetch != null; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); } return super.eIsSet(featureID); } @@ -1041,6 +1264,30 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE default: return -1; } } + if (baseClass == XmlJoinFetch.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH; + default: return -1; + } + } + if (baseClass == XmlBatchFetchHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + default: return -1; + } + } + if (baseClass == XmlElementCollection_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE; + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -1128,6 +1375,30 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE default: return -1; } } + if (baseClass == XmlJoinFetch.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH; + default: return -1; + } + } + if (baseClass == XmlBatchFetchHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH; + default: return -1; + } + } + if (baseClass == XmlElementCollection_2_1.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_1Package.XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE; + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } @@ -1146,6 +1417,10 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE result.append(convert); result.append(", mapKeyConvert: "); result.append(mapKeyConvert); + result.append(", joinFetch: "); + result.append(joinFetch); + result.append(", attributeType: "); + result.append(attributeType); result.append(')'); return result.toString(); } @@ -1172,6 +1447,10 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE return getElementTextRange(EclipseLink.CONVERT); } + public TextRange getJoinFetchTextRange() { + return getElementTextRange(EclipseLink.JOIN_FETCH); + } + // ********** translators ********** @@ -1189,6 +1468,7 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE buildTargetClassTranslator(), buildFetchTranslator(), buildAccessTranslator(), + buildAttributeTypeTranslator(), buildOrderByTranslator(), buildOrderColumnTranslator(), buildMapKeyTranslator(), @@ -1212,6 +1492,8 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE XmlConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter()), XmlConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter()), XmlCollectionTable.buildTranslator(JPA2_0.COLLECTION_TABLE, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_CollectionTable()), + buildJoinFetchTranslator(), + buildBatchFetchTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() }; @@ -1236,4 +1518,17 @@ 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.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlElementCollection_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildJoinFetchTranslator() { + return new Translator(EclipseLink.JOIN_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlJoinFetch_JoinFetch()); + } + + protected static Translator buildBatchFetchTranslator() { + return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java index 2106b0a3ba..7e356ceaa9 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddable.java @@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.resource.orm.XmlClassReference; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -35,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -54,9 +55,19 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddable implements XmlCustomizerHolder, XmlChangeTrackingHolder, XmlConvertersHolder, XmlPropertyContainer +public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddable implements XmlEmbeddable_2_1, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlConvertersHolder, XmlPropertyContainer { /** + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAccessMethods() + * @generated + * @ordered + */ + protected XmlAccessMethods accessMethods; + + /** * The cached value of the '{@link #getCustomizer() <em>Customizer</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -198,6 +209,66 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab } /** + * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Access Methods</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>Access Methods</em>' containment reference. + * @see #setAccessMethods(XmlAccessMethods) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods() + * @model containment="true" + * @generated + */ + public XmlAccessMethods getAccessMethods() + { + return accessMethods; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs) + { + XmlAccessMethods oldAccessMethods = accessMethods; + accessMethods = newAccessMethods; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, oldAccessMethods, newAccessMethods); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddable#getAccessMethods <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Access Methods</em>' containment reference. + * @see #getAccessMethods() + * @generated + */ + public void setAccessMethods(XmlAccessMethods newAccessMethods) + { + if (newAccessMethods != accessMethods) + { + NotificationChain msgs = null; + if (accessMethods != null) + msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, null, msgs); + if (newAccessMethods != null) + msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, null, msgs); + msgs = basicSetAccessMethods(newAccessMethods, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, newAccessMethods, newAccessMethods)); + } + + /** * Returns the value of the '<em><b>Customizer</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -657,6 +728,8 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: + return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return basicSetCustomizer(null, msgs); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: @@ -691,6 +764,8 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: + return getAccessMethods(); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return getCustomizer(); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: @@ -728,6 +803,9 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)newValue); + return; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: setCustomizer((XmlClassReference)newValue); return; @@ -780,6 +858,9 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)null); + return; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: setCustomizer((XmlClassReference)null); return; @@ -827,6 +908,8 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: + return accessMethods != null; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return customizer != null; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: @@ -861,6 +944,21 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + default: return -1; + } + } + if (baseClass == XmlEmbeddable_2_1.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } if (baseClass == XmlCustomizerHolder.class) { switch (derivedFeatureID) @@ -907,6 +1005,21 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS; + default: return -1; + } + } + if (baseClass == XmlEmbeddable_2_1.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } if (baseClass == XmlCustomizerHolder.class) { switch (baseFeatureID) @@ -979,6 +1092,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab buildMetadataCompleteTranslator(), buildExcludeDefaultMappingsTranslator(), buildDescriptionTranslator(), + buildAccessMethodsTranslator(), buildCustomizerTranslator(), buildChangeTrackingTranslator(), buildConverterTranslator(), @@ -1035,4 +1149,9 @@ public class XmlEmbeddable extends org.eclipse.jpt.core.resource.orm.XmlEmbeddab protected static Translator buildPropertyTranslator() { return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties()); } + + protected static Translator buildAccessMethodsTranslator() { + return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.java index 2707b312cd..54d001a5b0 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbedded.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. @@ -20,12 +20,24 @@ import org.eclipse.emf.ecore.InternalEObject; 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.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Embedded Impl</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.1 * <!-- end-user-doc --> * * @@ -33,9 +45,29 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded implements XmlAttributeMapping +public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded implements XmlEmbedded_2_1, XmlAttributeMapping { /** + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -77,6 +109,41 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i } /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -187,6 +254,8 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE: + return getAttributeType(); case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: @@ -206,6 +275,9 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -227,6 +299,9 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -247,6 +322,8 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: @@ -263,6 +340,14 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlEmbedded_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_EMBEDDED_21__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -297,6 +382,14 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlEmbedded_2_1.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_1Package.XML_EMBEDDED_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -323,6 +416,23 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeType: "); + result.append(attributeType); + result.append(')'); + return result.toString(); + } + // ********** translators ********** public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { @@ -337,6 +447,7 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i return new Translator[] { buildNameTranslator(), buildAccessTranslator(), + buildAttributeTypeTranslator(), buildAttributeOverrideTranslator(), buildAssociationOverrideTranslator(), buildPropertyTranslator(), @@ -351,4 +462,9 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEmbedded_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.java index c1803fae84..6e8f855364 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEmbeddedId.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. @@ -20,12 +20,24 @@ import org.eclipse.emf.ecore.InternalEObject; 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.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Embedded Id Impl</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.1 * <!-- end-user-doc --> * * @@ -33,9 +45,29 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbeddedId implements XmlAttributeMapping +public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbeddedId implements XmlEmbeddedId_2_1, XmlAttributeMapping { /** + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -77,6 +109,41 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded } /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -187,6 +254,8 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE: + return getAttributeType(); case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES: @@ -206,6 +275,9 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -227,6 +299,9 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -247,6 +322,8 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES: @@ -263,6 +340,14 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlEmbeddedId_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -297,6 +382,14 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlEmbeddedId_2_1.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_1Package.XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -323,6 +416,23 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeType: "); + result.append(attributeType); + result.append(')'); + return result.toString(); + } + // ********** translators ********** public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { @@ -337,6 +447,7 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded return new Translator[] { buildNameTranslator(), buildAccessTranslator(), + buildAttributeTypeTranslator(), buildAttributeOverrideTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() @@ -350,4 +461,9 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEmbeddedId_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + } 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 7588f28db3..b0e0eb7a9f 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 @@ -47,7 +47,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -100,6 +100,16 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple protected XmlQueryRedirectors queryRedirectors; /** + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAccessMethods() + * @generated + * @ordered + */ + protected XmlAccessMethods accessMethods; + + /** * The cached value of the '{@link #getFetchGroups() <em>Fetch Groups</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1139,6 +1149,66 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple } /** + * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Access Methods</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>Access Methods</em>' containment reference. + * @see #setAccessMethods(XmlAccessMethods) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods() + * @model containment="true" + * @generated + */ + public XmlAccessMethods getAccessMethods() + { + return accessMethods; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs) + { + XmlAccessMethods oldAccessMethods = accessMethods; + accessMethods = newAccessMethods; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, oldAccessMethods, newAccessMethods); + 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#getAccessMethods <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Access Methods</em>' containment reference. + * @see #getAccessMethods() + * @generated + */ + public void setAccessMethods(XmlAccessMethods newAccessMethods) + { + if (newAccessMethods != accessMethods) + { + NotificationChain msgs = null; + if (accessMethods != null) + msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, null, msgs); + if (newAccessMethods != null) + msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, null, msgs); + msgs = basicSetAccessMethods(newAccessMethods, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, newAccessMethods, newAccessMethods)); + } + + /** * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup}. * <!-- begin-user-doc --> @@ -1272,6 +1342,8 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple return basicSetCacheInterceptor(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return basicSetQueryRedirectors(null, msgs); + case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: + return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: return ((InternalEList<?>)getFetchGroups()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR: @@ -1322,6 +1394,8 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple return getCacheInterceptor(); case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return getQueryRedirectors(); + case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: + return getAccessMethods(); case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: return getFetchGroups(); case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR: @@ -1382,6 +1456,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: setQueryRedirectors((XmlQueryRedirectors)newValue); return; + case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)newValue); + return; case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: getFetchGroups().clear(); getFetchGroups().addAll((Collection<? extends XmlFetchGroup>)newValue); @@ -1466,6 +1543,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: setQueryRedirectors((XmlQueryRedirectors)null); return; + case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)null); + return; case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: getFetchGroups().clear(); return; @@ -1540,6 +1620,8 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple return cacheInterceptor != null; case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return queryRedirectors != null; + case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: + return accessMethods != null; case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: return fetchGroups != null && !fetchGroups.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR: @@ -1605,6 +1687,14 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple default: return -1; } } + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + default: return -1; + } + } if (baseClass == XmlFetchGroupContainer_2_1.class) { switch (derivedFeatureID) @@ -1709,6 +1799,14 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple default: return -1; } } + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS; + default: return -1; + } + } if (baseClass == XmlFetchGroupContainer_2_1.class) { switch (baseFeatureID) @@ -1834,6 +1932,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple buildExistenceCheckingTranslator(), buildExcludeDefaultMappingsTranslator(), buildDescriptionTranslator(), + buildAccessMethodsTranslator(), buildCustomizerTranslator(), buildChangeTrackingTranslator(), buildTableTranslator(), @@ -1962,4 +2061,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple protected static Translator buildPropertyTranslator() { return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties()); } + + protected static Translator buildAccessMethodsTranslator() { + return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java index 47abe4b988..3faa58a689 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntityMappings.java @@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.core.internal.utility.translators.SimpleRootTranslator; +import org.eclipse.jpt.core.resource.orm.JPA; import org.eclipse.jpt.core.resource.orm.OrmPackage; import org.eclipse.jpt.core.resource.orm.SqlResultSetMapping; import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery; @@ -43,7 +44,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -475,7 +476,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.core.resource.orm.XmlEnti private static Translator buildRootTranslator() { return new SimpleRootTranslator( - EclipseLink.ENTITY_MAPPINGS, + JPA.ENTITY_MAPPINGS, EclipseLinkOrmPackage.eINSTANCE.getXmlEntityMappings(), buildTranslatorChildren()); } @@ -487,24 +488,30 @@ public class XmlEntityMappings extends org.eclipse.jpt.core.resource.orm.XmlEnti buildSchemaNamespaceTranslator(), buildSchemaLocationTranslator(namespace, versionsToSchemaLocations), buildDescriptionTranslator(), - XmlPersistenceUnitMetadata.buildTranslator(EclipseLink2_0.PERSISTENCE_UNIT_METADATA, OrmPackage.eINSTANCE.getXmlEntityMappings_PersistenceUnitMetadata()), + XmlPersistenceUnitMetadata.buildTranslator(JPA.PERSISTENCE_UNIT_METADATA, OrmPackage.eINSTANCE.getXmlEntityMappings_PersistenceUnitMetadata()), buildPackageTranslator(), buildSchemaTranslator(), buildCatalogTranslator(), buildAccessTranslator(), - XmlConverter.buildTranslator(EclipseLink2_0.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters()), - XmlTypeConverter.buildTranslator(EclipseLink2_0.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters()), - XmlObjectTypeConverter.buildTranslator(EclipseLink2_0.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters()), - XmlStructConverter.buildTranslator(EclipseLink2_0.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_StructConverters()), - XmlSequenceGenerator.buildTranslator(EclipseLink2_0.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_SequenceGenerators()), - XmlTableGenerator.buildTranslator(EclipseLink2_0.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_TableGenerators()), - XmlNamedQuery.buildTranslator(EclipseLink2_0.NAMED_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedQueries()), - XmlNamedNativeQuery.buildTranslator(EclipseLink2_0.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries()), - XmlNamedStoredProcedureQuery.buildTranslator(EclipseLink2_0.NAMED_STORED_PROCEDURE_QUERY, EclipseLinkOrmPackage.eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries()), - SqlResultSetMapping.buildTranslator(EclipseLink2_0.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntityMappings_SqlResultSetMappings()), - XmlMappedSuperclass.buildTranslator(EclipseLink2_0.MAPPED_SUPERCLASS, OrmPackage.eINSTANCE.getXmlEntityMappings_MappedSuperclasses()), - XmlEntity.buildTranslator(EclipseLink2_0.ENTITY, OrmPackage.eINSTANCE.getXmlEntityMappings_Entities()), - XmlEmbeddable.buildTranslator(EclipseLink2_0.EMBEDDABLE, OrmPackage.eINSTANCE.getXmlEntityMappings_Embeddables()), + buildAccessMethodsTranslator(), + XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters()), + XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters()), + XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters()), + XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_StructConverters()), + XmlSequenceGenerator.buildTranslator(JPA.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_SequenceGenerators()), + XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_TableGenerators()), + XmlNamedQuery.buildTranslator(JPA.NAMED_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedQueries()), + XmlNamedNativeQuery.buildTranslator(JPA.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries()), + XmlNamedStoredProcedureQuery.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY, EclipseLinkOrmPackage.eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries()), + SqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntityMappings_SqlResultSetMappings()), + XmlMappedSuperclass.buildTranslator(JPA.MAPPED_SUPERCLASS, OrmPackage.eINSTANCE.getXmlEntityMappings_MappedSuperclasses()), + XmlEntity.buildTranslator(JPA.ENTITY, OrmPackage.eINSTANCE.getXmlEntityMappings_Entities()), + XmlEmbeddable.buildTranslator(JPA.EMBEDDABLE, OrmPackage.eINSTANCE.getXmlEntityMappings_Embeddables()), }; } + + protected static Translator buildAccessMethodsTranslator() { + return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java index bd2aed1cb7..7e9dcafc47 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.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. @@ -20,6 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject; 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.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -35,7 +38,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -45,9 +48,29 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements XmlAttributeMapping, XmlMutable, XmlConvertibleMapping +public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements XmlId_2_1, XmlAttributeMapping, XmlMutable, XmlConvertibleMapping { /** + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -169,6 +192,41 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm } /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Mutable</b></em>' attribute. * <!-- begin-user-doc --> * <p> @@ -597,6 +655,8 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE: + return getAttributeType(); case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_ID__PROPERTIES: @@ -628,6 +688,9 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -667,6 +730,9 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -705,6 +771,8 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_ID__PROPERTIES: @@ -733,6 +801,14 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlId_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_ID_21__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -794,6 +870,14 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlId_2_1.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_1Package.XML_ID_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -858,7 +942,9 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (mutable: "); + result.append(" (attributeType: "); + result.append(attributeType); + result.append(", mutable: "); result.append(mutable); result.append(", convert: "); result.append(convert); @@ -890,6 +976,7 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm buildNameTranslator(), buildAccessTranslator(), buildMutableTranslator(), + buildAttributeTypeTranslator(), buildColumnTranslator(), buildGeneratedValueTranslator(), buildTemporalTranslator(), @@ -936,4 +1023,9 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlId_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + } 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 277b50c2a5..119c67e5d5 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 @@ -31,6 +31,9 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Pack import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_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.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -44,7 +47,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -54,113 +57,143 @@ 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, XmlManyToMany_2_0 +public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMany implements XmlManyToMany_2_0, XmlManyToMany_2_1, XmlAttributeMapping, XmlJoinFetch { /** - * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAccessMethods() + * @see #getConverter() * @generated * @ordered */ - protected XmlAccessMethods accessMethods; + protected XmlConverter converter; /** - * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. + * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getProperties() + * @see #getTypeConverter() * @generated * @ordered */ - protected EList<XmlProperty> properties; + protected XmlTypeConverter typeConverter; /** - * changed this to null and removed the generated flag so emf won't generate over it - * we don't want a default for enums, just null if the tag does not exist + * 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 static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null; + protected XmlObjectTypeConverter objectTypeConverter; /** - * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute. + * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getJoinFetch() + * @see #getStructConverter() * @generated * @ordered */ - protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; + protected XmlStructConverter structConverter; /** - * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. + * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConverter() + * @see #getMapKeyAssociationOverrides() * @generated * @ordered */ - protected XmlConverter converter; + protected EList<XmlAssociationOverride> mapKeyAssociationOverrides; /** - * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. + * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTypeConverter() + * @see #getMapKeyConvert() * @generated * @ordered */ - protected XmlTypeConverter typeConverter; + protected static final String MAP_KEY_CONVERT_EDEFAULT = null; /** - * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. + * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getObjectTypeConverter() + * @see #getMapKeyConvert() * @generated * @ordered */ - protected XmlObjectTypeConverter objectTypeConverter; + protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT; /** - * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. + * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getStructConverter() + * @see #getBatchFetch() * @generated * @ordered */ - protected XmlStructConverter structConverter; + protected XmlBatchFetch batchFetch; /** - * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list. + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMapKeyAssociationOverrides() + * @see #getAttributeType() * @generated * @ordered */ - protected EList<XmlAssociationOverride> mapKeyAssociationOverrides; + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; /** - * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMapKeyConvert() + * @see #getAttributeType() * @generated * @ordered */ - protected static final String MAP_KEY_CONVERT_EDEFAULT = null; + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; /** - * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMapKeyConvert() + * @see #getAccessMethods() * @generated * @ordered */ - protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT; + protected XmlAccessMethods accessMethods; + + /** + * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProperties() + * @generated + * @ordered + */ + protected EList<XmlProperty> properties; + + /** + * changed this to null and removed the generated flag so emf won't generate over it + * we don't want a default for enums, just null if the tag does not exist + */ + protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null; + + /** + * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getJoinFetch() + * @generated + * @ordered + */ + protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; /** * <!-- begin-user-doc --> @@ -520,6 +553,101 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa } /** + * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference. + * @see #setBatchFetch(XmlBatchFetch) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch() + * @model containment="true" + * @generated + */ + public XmlBatchFetch getBatchFetch() + { + return batchFetch; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs) + { + XmlBatchFetch oldBatchFetch = batchFetch; + batchFetch = newBatchFetch; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, oldBatchFetch, newBatchFetch); + 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#getBatchFetch <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch</em>' containment reference. + * @see #getBatchFetch() + * @generated + */ + public void setBatchFetch(XmlBatchFetch newBatchFetch) + { + if (newBatchFetch != batchFetch) + { + NotificationChain msgs = null; + if (batchFetch != null) + msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, null, msgs); + if (newBatchFetch != null) + msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, null, msgs); + msgs = basicSetBatchFetch(newBatchFetch, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, newBatchFetch, newBatchFetch)); + } + + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -612,10 +740,6 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa { switch (featureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: - 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: @@ -626,6 +750,12 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa return basicSetStructConverter(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: + return basicSetBatchFetch(null, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: + return basicSetAccessMethods(null, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: + return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -640,12 +770,6 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa { switch (featureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: - return getAccessMethods(); - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: - 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: @@ -658,6 +782,16 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa return getMapKeyAssociationOverrides(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: return getMapKeyConvert(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: + return getBatchFetch(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE: + return getAttributeType(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: + return getAccessMethods(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: + return getProperties(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: + return getJoinFetch(); } return super.eGet(featureID, resolve, coreType); } @@ -673,16 +807,6 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa { switch (featureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: - setAccessMethods((XmlAccessMethods)newValue); - return; - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: - getProperties().clear(); - getProperties().addAll((Collection<? extends XmlProperty>)newValue); - return; - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: - setJoinFetch((XmlJoinFetchType)newValue); - return; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: setConverter((XmlConverter)newValue); return; @@ -702,6 +826,22 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: setMapKeyConvert((String)newValue); return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: + getProperties().clear(); + getProperties().addAll((Collection<? extends XmlProperty>)newValue); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: + setJoinFetch((XmlJoinFetchType)newValue); + return; } super.eSet(featureID, newValue); } @@ -716,15 +856,6 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa { switch (featureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: - setAccessMethods((XmlAccessMethods)null); - return; - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: - getProperties().clear(); - return; - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: - setJoinFetch(JOIN_FETCH_EDEFAULT); - return; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: setConverter((XmlConverter)null); return; @@ -743,6 +874,21 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)null); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)null); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: + getProperties().clear(); + return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: + setJoinFetch(JOIN_FETCH_EDEFAULT); + return; } super.eUnset(featureID); } @@ -757,12 +903,6 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa { switch (featureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: - return accessMethods != null; - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: - 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: @@ -775,6 +915,16 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: + return batchFetch != null; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: + return accessMethods != null; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: + return properties != null && !properties.isEmpty(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: + return joinFetch != JOIN_FETCH_EDEFAULT; } return super.eIsSet(featureID); } @@ -787,68 +937,84 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) + if (baseClass == XmlConverterHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + 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 == XmlPropertyContainer.class) + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES; + 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; } } - if (baseClass == XmlAttributeMapping.class) + if (baseClass == XmlCollectionMapping_2_0.class) { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT; default: return -1; } } - if (baseClass == XmlJoinFetch.class) + if (baseClass == XmlManyToMany_2_0.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH; default: return -1; } } - if (baseClass == XmlConverterHolder.class) + if (baseClass == XmlBatchFetchHolder.class) { switch (derivedFeatureID) { - 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; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) + if (baseClass == XmlManyToMany_2_1.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; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE; default: return -1; } } - if (baseClass == XmlCollectionMapping_2_0.class) + if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlManyToMany_2_0.class) + if (baseClass == XmlPropertyContainer.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES; + default: return -1; + } + } + if (baseClass == XmlAttributeMapping.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } + if (baseClass == XmlJoinFetch.class) { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH; default: return -1; } } @@ -863,68 +1029,84 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) + if (baseClass == XmlConverterHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS; + 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 == XmlPropertyContainer.class) + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES; + 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; } } - if (baseClass == XmlAttributeMapping.class) + if (baseClass == XmlCollectionMapping_2_0.class) { switch (baseFeatureID) { + case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT; default: return -1; } } - if (baseClass == XmlJoinFetch.class) + if (baseClass == XmlManyToMany_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH; default: return -1; } } - if (baseClass == XmlConverterHolder.class) + if (baseClass == XmlBatchFetchHolder.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; + case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH; default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) + if (baseClass == XmlManyToMany_2_1.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmV2_1Package.XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE; default: return -1; } } - if (baseClass == XmlCollectionMapping_2_0.class) + if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT; + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlManyToMany_2_0.class) + if (baseClass == XmlPropertyContainer.class) { switch (baseFeatureID) { + case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES; + default: return -1; + } + } + if (baseClass == XmlAttributeMapping.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } + if (baseClass == XmlJoinFetch.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH; default: return -1; } } @@ -942,10 +1124,12 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (joinFetch: "); - result.append(joinFetch); - result.append(", mapKeyConvert: "); + result.append(" (mapKeyConvert: "); result.append(mapKeyConvert); + result.append(", attributeType: "); + result.append(attributeType); + result.append(", joinFetch: "); + result.append(joinFetch); result.append(')'); return result.toString(); } @@ -972,6 +1156,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa buildFetchTranslator(), buildAccessTranslator(), buildMappedByTranslator(), + buildAttributeTypeTranslator(), buildOrderByTranslator(), XmlOrderColumn.buildTranslator(JPA2_0.ORDER_COLUMN, OrmV2_0Package.eINSTANCE.getXmlOrderable_2_0_OrderColumn()), buildMapKeyTranslator(), @@ -990,6 +1175,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa buildJoinTableTranslator(), buildCascadeTranslator(), buildJoinFetchTranslator(), + buildBatchFetchTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() }; @@ -1034,4 +1220,13 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlManyToMany_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildBatchFetchTranslator() { + return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.java index 57c4e664d8..9dee8cfd55 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToOne.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. @@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.InternalEObject; 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.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1; import org.eclipse.jpt.core.internal.utility.translators.EmptyTagBooleanTranslator; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.utility.TextRange; @@ -36,7 +38,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -46,9 +48,19 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne implements XmlAttributeMapping, XmlJoinFetch +public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne implements XmlManyToOne_2_1, XmlAttributeMapping, XmlJoinFetch { /** + * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getBatchFetch() + * @generated + * @ordered + */ + protected XmlBatchFetch batchFetch; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -106,6 +118,66 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne } /** + * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference. + * @see #setBatchFetch(XmlBatchFetch) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch() + * @model containment="true" + * @generated + */ + public XmlBatchFetch getBatchFetch() + { + return batchFetch; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs) + { + XmlBatchFetch oldBatchFetch = batchFetch; + batchFetch = newBatchFetch; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, oldBatchFetch, newBatchFetch); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne#getBatchFetch <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch</em>' containment reference. + * @see #getBatchFetch() + * @generated + */ + public void setBatchFetch(XmlBatchFetch newBatchFetch) + { + if (newBatchFetch != batchFetch) + { + NotificationChain msgs = null; + if (batchFetch != null) + msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, null, msgs); + if (newBatchFetch != null) + msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, null, msgs); + msgs = basicSetBatchFetch(newBatchFetch, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, newBatchFetch, newBatchFetch)); + } + + /** * Returns the value of the '<em><b>Join Fetch</b></em>' attribute. * The literals are from the enumeration {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType}. * <!-- begin-user-doc --> @@ -236,6 +308,8 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne { switch (featureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: + return basicSetBatchFetch(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES: @@ -254,6 +328,8 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne { switch (featureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: + return getBatchFetch(); case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES: @@ -275,6 +351,9 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne { switch (featureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)newValue); + return; case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -299,6 +378,9 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne { switch (featureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)null); + return; case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -322,6 +404,8 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne { switch (featureID) { + case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: + return batchFetch != null; case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES: @@ -340,6 +424,21 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlBatchFetchHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + default: return -1; + } + } + if (baseClass == XmlManyToOne_2_1.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -382,6 +481,21 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlBatchFetchHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH; + default: return -1; + } + } + if (baseClass == XmlManyToOne_2_1.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -461,6 +575,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne buildJoinTableTranslator(), buildCascadeTranslator(), buildJoinFetchTranslator(), + buildBatchFetchTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() }; @@ -481,4 +596,9 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildBatchFetchTranslator() { + return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch()); + } + } 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 e8be506d48..c4a82a0ba5 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 @@ -61,7 +61,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -204,6 +204,16 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries; /** + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAccessMethods() + * @generated + * @ordered + */ + protected XmlAccessMethods accessMethods; + + /** * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1443,6 +1453,66 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa } /** + * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Access Methods</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>Access Methods</em>' containment reference. + * @see #setAccessMethods(XmlAccessMethods) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods() + * @model containment="true" + * @generated + */ + public XmlAccessMethods getAccessMethods() + { + return accessMethods; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs) + { + XmlAccessMethods oldAccessMethods = accessMethods; + accessMethods = newAccessMethods; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, oldAccessMethods, newAccessMethods); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getAccessMethods <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Access Methods</em>' containment reference. + * @see #getAccessMethods() + * @generated + */ + public void setAccessMethods(XmlAccessMethods newAccessMethods) + { + if (newAccessMethods != accessMethods) + { + NotificationChain msgs = null; + if (accessMethods != null) + msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, null, msgs); + if (newAccessMethods != null) + msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, null, msgs); + msgs = basicSetAccessMethods(newAccessMethods, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, newAccessMethods, newAccessMethods)); + } + + /** * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}. * <!-- begin-user-doc --> @@ -1590,6 +1660,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa return ((InternalEList<?>)getNamedNativeQueries()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: + return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: return ((InternalEList<?>)getSqlResultSetMappings()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS: @@ -1654,6 +1726,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa return getNamedNativeQueries(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: return getNamedStoredProcedureQueries(); + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: + return getAccessMethods(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: return getSqlResultSetMappings(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS: @@ -1742,6 +1816,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa getNamedStoredProcedureQueries().clear(); getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue); return; + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)newValue); + return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: getSqlResultSetMappings().clear(); getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue); @@ -1846,6 +1923,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: getNamedStoredProcedureQueries().clear(); return; + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)null); + return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: getSqlResultSetMappings().clear(); return; @@ -1933,6 +2013,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa return namedNativeQueries != null && !namedNativeQueries.isEmpty(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty(); + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: + return accessMethods != null; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: return sqlResultSetMappings != null && !sqlResultSetMappings.isEmpty(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS: @@ -2053,6 +2135,14 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa default: return -1; } } + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + default: return -1; + } + } if (baseClass == XmlMappedSuperclass_2_1.class) { switch (derivedFeatureID) @@ -2199,6 +2289,14 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa default: return -1; } } + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS; + default: return -1; + } + } if (baseClass == XmlMappedSuperclass_2_1.class) { switch (baseFeatureID) @@ -2316,6 +2414,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa buildExistenceCheckingTranslator(), buildExcludeDefaultMappingsTranslator(), buildDescriptionTranslator(), + buildAccessMethodsTranslator(), buildCustomizerTranslator(), buildChangeTrackingTranslator(), buildIdClassTranslator(), @@ -2465,4 +2564,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa protected static Translator buildAssociationOverrideTranslator() { return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides()); } + + protected static Translator buildAccessMethodsTranslator() { + return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); + } + } 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 6602e4dd8a..264886c9c1 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 @@ -31,6 +31,9 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Pack import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_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.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -44,7 +47,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -54,133 +57,163 @@ 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, XmlOneToMany_2_0 +public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany implements XmlOneToMany_2_0, XmlOneToMany_2_1, XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch { /** - * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAccessMethods() + * @see #getConverter() * @generated * @ordered */ - protected XmlAccessMethods accessMethods; + protected XmlConverter converter; /** - * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. + * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getProperties() + * @see #getTypeConverter() * @generated * @ordered */ - protected EList<XmlProperty> properties; + protected XmlTypeConverter typeConverter; /** - * The default value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute. + * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #isPrivateOwned() + * @see #getObjectTypeConverter() * @generated * @ordered */ - protected static final boolean PRIVATE_OWNED_EDEFAULT = false; + protected XmlObjectTypeConverter objectTypeConverter; /** - * The cached value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute. + * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #isPrivateOwned() + * @see #getStructConverter() * @generated * @ordered */ - protected boolean privateOwned = PRIVATE_OWNED_EDEFAULT; + protected XmlStructConverter structConverter; /** - * changed this to null and removed the generated flag so emf won't generate over it - * we don't want a default for enums, just null if the tag does not exist + * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMapKeyAssociationOverrides() + * @generated + * @ordered */ - protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null; + protected EList<XmlAssociationOverride> mapKeyAssociationOverrides; /** - * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute. + * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getJoinFetch() + * @see #getMapKeyConvert() * @generated * @ordered */ - protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; + protected static final String MAP_KEY_CONVERT_EDEFAULT = null; /** - * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference. + * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getConverter() + * @see #getMapKeyConvert() * @generated * @ordered */ - protected XmlConverter converter; + protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT; /** - * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference. + * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTypeConverter() + * @see #getBatchFetch() * @generated * @ordered */ - protected XmlTypeConverter typeConverter; + protected XmlBatchFetch batchFetch; /** - * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference. + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getObjectTypeConverter() + * @see #getAttributeType() * @generated * @ordered */ - protected XmlObjectTypeConverter objectTypeConverter; + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; /** - * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference. + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getStructConverter() + * @see #getAttributeType() * @generated * @ordered */ - protected XmlStructConverter structConverter; + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; /** - * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list. + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMapKeyAssociationOverrides() + * @see #getAccessMethods() * @generated * @ordered */ - protected EList<XmlAssociationOverride> mapKeyAssociationOverrides; + protected XmlAccessMethods accessMethods; /** - * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. + * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMapKeyConvert() + * @see #getProperties() * @generated * @ordered */ - protected static final String MAP_KEY_CONVERT_EDEFAULT = null; + protected EList<XmlProperty> properties; /** - * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute. + * The default value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMapKeyConvert() + * @see #isPrivateOwned() * @generated * @ordered */ - protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT; + protected static final boolean PRIVATE_OWNED_EDEFAULT = false; + + /** + * The cached value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #isPrivateOwned() + * @generated + * @ordered + */ + protected boolean privateOwned = PRIVATE_OWNED_EDEFAULT; + + /** + * changed this to null and removed the generated flag so emf won't generate over it + * we don't want a default for enums, just null if the tag does not exist + */ + protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null; + + /** + * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getJoinFetch() + * @generated + * @ordered + */ + protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT; /** * <!-- begin-user-doc --> @@ -575,6 +608,101 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany } /** + * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference. + * @see #setBatchFetch(XmlBatchFetch) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch() + * @model containment="true" + * @generated + */ + public XmlBatchFetch getBatchFetch() + { + return batchFetch; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs) + { + XmlBatchFetch oldBatchFetch = batchFetch; + batchFetch = newBatchFetch; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, oldBatchFetch, newBatchFetch); + 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#getBatchFetch <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch</em>' containment reference. + * @see #getBatchFetch() + * @generated + */ + public void setBatchFetch(XmlBatchFetch newBatchFetch) + { + if (newBatchFetch != batchFetch) + { + NotificationChain msgs = null; + if (batchFetch != null) + msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, null, msgs); + if (newBatchFetch != null) + msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, null, msgs); + msgs = basicSetBatchFetch(newBatchFetch, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, newBatchFetch, newBatchFetch)); + } + + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -667,10 +795,6 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany { switch (featureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: - 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: @@ -681,6 +805,12 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany return basicSetStructConverter(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: + return basicSetBatchFetch(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: + return basicSetAccessMethods(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: + return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -695,14 +825,6 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany { switch (featureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: - return getAccessMethods(); - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: - return getProperties(); - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: - 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: @@ -715,6 +837,18 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany return getMapKeyAssociationOverrides(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: return getMapKeyConvert(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: + return getBatchFetch(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE: + return getAttributeType(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: + return getAccessMethods(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: + return getProperties(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: + return isPrivateOwned(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: + return getJoinFetch(); } return super.eGet(featureID, resolve, coreType); } @@ -730,19 +864,6 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany { switch (featureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: - setAccessMethods((XmlAccessMethods)newValue); - return; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: - getProperties().clear(); - getProperties().addAll((Collection<? extends XmlProperty>)newValue); - return; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: - setPrivateOwned((Boolean)newValue); - return; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: - setJoinFetch((XmlJoinFetchType)newValue); - return; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: setConverter((XmlConverter)newValue); return; @@ -762,6 +883,25 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: setMapKeyConvert((String)newValue); return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: + getProperties().clear(); + getProperties().addAll((Collection<? extends XmlProperty>)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: + setPrivateOwned((Boolean)newValue); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: + setJoinFetch((XmlJoinFetchType)newValue); + return; } super.eSet(featureID, newValue); } @@ -776,18 +916,6 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany { switch (featureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: - setAccessMethods((XmlAccessMethods)null); - return; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: - getProperties().clear(); - return; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: - setPrivateOwned(PRIVATE_OWNED_EDEFAULT); - return; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: - setJoinFetch(JOIN_FETCH_EDEFAULT); - return; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: setConverter((XmlConverter)null); return; @@ -806,6 +934,24 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)null); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)null); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: + getProperties().clear(); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: + setPrivateOwned(PRIVATE_OWNED_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: + setJoinFetch(JOIN_FETCH_EDEFAULT); + return; } super.eUnset(featureID); } @@ -820,14 +966,6 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany { switch (featureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: - return accessMethods != null; - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: - return properties != null && !properties.isEmpty(); - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: - 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: @@ -840,6 +978,18 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: + return batchFetch != null; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: + return accessMethods != null; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: + return properties != null && !properties.isEmpty(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: + return privateOwned != PRIVATE_OWNED_EDEFAULT; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: + return joinFetch != JOIN_FETCH_EDEFAULT; } return super.eIsSet(featureID); } @@ -852,79 +1002,95 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) + if (baseClass == XmlConverterHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + 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 == XmlPropertyContainer.class) + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES; + 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; } } - if (baseClass == XmlAttributeMapping.class) + if (baseClass == XmlCollectionMapping_2_0.class) { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT; default: return -1; } } - if (baseClass == XmlPrivateOwned.class) + if (baseClass == XmlOneToMany_2_0.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED; default: return -1; } } - if (baseClass == XmlJoinFetch.class) + if (baseClass == XmlBatchFetchHolder.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; default: return -1; } } - if (baseClass == XmlConverterHolder.class) + if (baseClass == XmlOneToMany_2_1.class) { switch (derivedFeatureID) { - 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; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE; default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) + if (baseClass == XmlAccessMethodsHolder.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; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlCollectionMapping_2_0.class) + if (baseClass == XmlPropertyContainer.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES; default: return -1; } } - if (baseClass == XmlOneToMany_2_0.class) + if (baseClass == XmlAttributeMapping.class) { switch (derivedFeatureID) { default: return -1; } } + if (baseClass == XmlPrivateOwned.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED; + default: return -1; + } + } + if (baseClass == XmlJoinFetch.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH; + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -936,76 +1102,92 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) + if (baseClass == XmlConverterHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS; + 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 == XmlPropertyContainer.class) + if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES; + 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; } } - if (baseClass == XmlAttributeMapping.class) + if (baseClass == XmlCollectionMapping_2_0.class) { switch (baseFeatureID) { + case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT; default: return -1; } } - if (baseClass == XmlPrivateOwned.class) + if (baseClass == XmlOneToMany_2_0.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED; default: return -1; } } - if (baseClass == XmlJoinFetch.class) + if (baseClass == XmlBatchFetchHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH; + case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH; default: return -1; } } - if (baseClass == XmlConverterHolder.class) + if (baseClass == XmlOneToMany_2_1.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; + case EclipseLinkOrmV2_1Package.XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE; default: return -1; } } - if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class) + if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES; + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlCollectionMapping_2_0.class) + if (baseClass == XmlPropertyContainer.class) { switch (baseFeatureID) { - case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT; + case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES; default: return -1; } } - if (baseClass == XmlOneToMany_2_0.class) + if (baseClass == XmlAttributeMapping.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } + if (baseClass == XmlPrivateOwned.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED; + default: return -1; + } + } + if (baseClass == XmlJoinFetch.class) { switch (baseFeatureID) { + case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH; default: return -1; } } @@ -1023,12 +1205,14 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (privateOwned: "); + result.append(" (mapKeyConvert: "); + result.append(mapKeyConvert); + result.append(", attributeType: "); + result.append(attributeType); + result.append(", privateOwned: "); result.append(privateOwned); result.append(", joinFetch: "); result.append(joinFetch); - result.append(", mapKeyConvert: "); - result.append(mapKeyConvert); result.append(')'); return result.toString(); } @@ -1060,6 +1244,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany buildAccessTranslator(), buildMappedByTranslator(), buildOrphanRemovalTranslator(), + buildAttributeTypeTranslator(), buildOrderByTranslator(), XmlOrderColumn.buildTranslator(JPA2_0.ORDER_COLUMN, OrmV2_0Package.eINSTANCE.getXmlOrderable_2_0_OrderColumn()), buildMapKeyTranslator(), @@ -1080,6 +1265,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany buildCascadeTranslator(), buildPrivateOwnedTranslator(), buildJoinFetchTranslator(), + buildBatchFetchTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() }; @@ -1124,4 +1310,13 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlOneToMany_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildBatchFetchTranslator() { + return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.java index c0a84c7ec7..5d7dd96327 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToOne.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. @@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.InternalEObject; 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.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1; import org.eclipse.jpt.core.internal.utility.translators.EmptyTagBooleanTranslator; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.utility.TextRange; @@ -36,7 +38,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -46,9 +48,19 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne implements XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch +public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne implements XmlOneToOne_2_1, XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch { /** + * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getBatchFetch() + * @generated + * @ordered + */ + protected XmlBatchFetch batchFetch; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -126,6 +138,66 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i } /** + * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference. + * @see #setBatchFetch(XmlBatchFetch) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch() + * @model containment="true" + * @generated + */ + public XmlBatchFetch getBatchFetch() + { + return batchFetch; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs) + { + XmlBatchFetch oldBatchFetch = batchFetch; + batchFetch = newBatchFetch; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, oldBatchFetch, newBatchFetch); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne#getBatchFetch <em>Batch Fetch</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch</em>' containment reference. + * @see #getBatchFetch() + * @generated + */ + public void setBatchFetch(XmlBatchFetch newBatchFetch) + { + if (newBatchFetch != batchFetch) + { + NotificationChain msgs = null; + if (batchFetch != null) + msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, null, msgs); + if (newBatchFetch != null) + msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, null, msgs); + msgs = basicSetBatchFetch(newBatchFetch, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, newBatchFetch, newBatchFetch)); + } + + /** * Returns the value of the '<em><b>Private Owned</b></em>' attribute. * <!-- begin-user-doc --> * <p> @@ -291,6 +363,8 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i { switch (featureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: + return basicSetBatchFetch(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: @@ -309,6 +383,8 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i { switch (featureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: + return getBatchFetch(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: @@ -332,6 +408,9 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i { switch (featureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)newValue); + return; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -359,6 +438,9 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i { switch (featureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: + setBatchFetch((XmlBatchFetch)null); + return; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -385,6 +467,8 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i { switch (featureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: + return batchFetch != null; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: @@ -405,6 +489,21 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlBatchFetchHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + default: return -1; + } + } + if (baseClass == XmlOneToOne_2_1.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -455,6 +554,21 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlBatchFetchHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH; + default: return -1; + } + } + if (baseClass == XmlOneToOne_2_1.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -552,6 +666,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i buildCascadeTranslator(), buildPrivateOwnedTranslator(), buildJoinFetchTranslator(), + buildBatchFetchTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() }; @@ -572,4 +687,9 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildBatchFetchTranslator() { + return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch()); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java new file mode 100644 index 0000000000..daac937911 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java @@ -0,0 +1,295 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1; +import org.eclipse.wst.common.internal.emf.resource.Translator; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Persistence Unit Defaults</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults() + * @model kind="class" + * @generated + */ +public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults implements XmlPersistenceUnitDefaults_2_1 +{ + /** + * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAccessMethods() + * @generated + * @ordered + */ + protected XmlAccessMethods accessMethods; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected XmlPersistenceUnitDefaults() + { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_PERSISTENCE_UNIT_DEFAULTS; + } + + /** + * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Access Methods</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>Access Methods</em>' containment reference. + * @see #setAccessMethods(XmlAccessMethods) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods() + * @model containment="true" + * @generated + */ + public XmlAccessMethods getAccessMethods() + { + return accessMethods; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs) + { + XmlAccessMethods oldAccessMethods = accessMethods; + accessMethods = newAccessMethods; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, oldAccessMethods, newAccessMethods); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults#getAccessMethods <em>Access Methods</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Access Methods</em>' containment reference. + * @see #getAccessMethods() + * @generated + */ + public void setAccessMethods(XmlAccessMethods newAccessMethods) + { + if (newAccessMethods != accessMethods) + { + NotificationChain msgs = null; + if (accessMethods != null) + msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, null, msgs); + if (newAccessMethods != null) + msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, null, msgs); + msgs = basicSetAccessMethods(newAccessMethods, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, newAccessMethods, newAccessMethods)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: + return basicSetAccessMethods(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: + return getAccessMethods(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: + setAccessMethods((XmlAccessMethods)null); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: + return accessMethods != null; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) + { + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + default: return -1; + } + } + if (baseClass == XmlPersistenceUnitDefaults_2_1.class) + { + switch (derivedFeatureID) + { + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) + { + if (baseClass == XmlAccessMethodsHolder.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS; + default: return -1; + } + } + if (baseClass == XmlPersistenceUnitDefaults_2_1.class) + { + switch (baseFeatureID) + { + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildDescriptionTranslator(), + buildSchemaTranslator(), + buildCatalogTranslator(), + buildDelimitedIdentifiersTranslator(), + buildAccessTranslator(), + buildAccessMethodsTranslator(), + buildCascadePersistTranslator(), + buildEntityListenersTranslator() + }; + } + + protected static Translator buildAccessMethodsTranslator() { + return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); + } + +} // XmlPersistenceUnitDefaults diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java index e052f2f8b1..f842826747 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.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. @@ -16,6 +16,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.core.internal.utility.translators.EmptyTagBooleanTranslator; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.core.resource.orm.JPA; +import org.eclipse.jpt.core.resource.orm.OrmPackage; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -28,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 2.3 * @since 2.2 * * <!-- end-user-doc --> @@ -221,7 +223,7 @@ public class XmlPersistenceUnitMetadata extends org.eclipse.jpt.core.resource.or buildDescriptionTranslator(), buildXmlMappingMetadataCompleteTranslator(), buildExcludeDefaultMappingsTranslator(), - buildXmlPersistenceUnitDefaultsTranslator(), + XmlPersistenceUnitDefaults.buildTranslator(JPA.PERSISTENCE_UNIT_DEFAULTS, OrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults()) }; } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.java index 5215890664..b2c0082e22 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTransformation.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. @@ -22,6 +22,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1; import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -42,9 +45,29 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlTransformation extends AbstractXmlAttributeMapping implements XmlAttributeMapping +public class XmlTransformation extends AbstractXmlAttributeMapping implements XmlTransformation_2_1, XmlAttributeMapping { /** + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -86,6 +109,41 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm } /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -196,6 +254,8 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE: + return getAttributeType(); case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES: @@ -215,6 +275,9 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -236,6 +299,9 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -256,6 +322,8 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm { switch (featureID) { + case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES: @@ -272,6 +340,14 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlTransformation_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_TRANSFORMATION_21__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -306,6 +382,14 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlTransformation_2_1.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_1Package.XML_TRANSFORMATION_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -332,6 +416,23 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (attributeType: "); + result.append(attributeType); + result.append(')'); + return result.toString(); + } + public String getMappingKey() { return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY; } @@ -350,6 +451,7 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm // buildOptionalTranslator(), buildAccessTranslator(), // buildMutableTranslator(), + buildAttributeTypeTranslator(), // buildReadTransformerTranslator(), // buildWriteTransformerTranslator(), buildPropertyTranslator(), @@ -364,4 +466,9 @@ public class XmlTransformation extends AbstractXmlAttributeMapping implements Xm protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlTransformation_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java index 7d75384b83..93fdfed2ba 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.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. @@ -20,6 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject; 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.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; +import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -35,7 +38,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 2.3 * @since 2.1 * * <!-- end-user-doc --> @@ -45,9 +48,29 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion implements XmlAttributeMapping, XmlMutable, XmlConvertibleMapping +public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion implements XmlVersion_2_1, XmlAttributeMapping, XmlMutable, XmlConvertibleMapping { /** + * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected static final String ATTRIBUTE_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAttributeType() + * @generated + * @ordered + */ + protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT; + + /** * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -169,6 +192,41 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp } /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getAttributeType() + { + return attributeType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + public void setAttributeType(String newAttributeType) + { + String oldAttributeType = attributeType; + attributeType = newAttributeType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE, oldAttributeType, attributeType)); + } + + /** * Returns the value of the '<em><b>Mutable</b></em>' attribute. * <!-- begin-user-doc --> * <p> @@ -597,6 +655,8 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp { switch (featureID) { + case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE: + return getAttributeType(); case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES: @@ -628,6 +688,9 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp { switch (featureID) { + case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE: + setAttributeType((String)newValue); + return; case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -667,6 +730,9 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp { switch (featureID) { + case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE: + setAttributeType(ATTRIBUTE_TYPE_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -705,6 +771,8 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp { switch (featureID) { + case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE: + return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType); case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES: @@ -733,6 +801,14 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { + if (baseClass == XmlVersion_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_VERSION_21__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -794,6 +870,14 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { + if (baseClass == XmlVersion_2_1.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_1Package.XML_VERSION_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -858,7 +942,9 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (mutable: "); + result.append(" (attributeType: "); + result.append(attributeType); + result.append(", mutable: "); result.append(mutable); result.append(", convert: "); result.append(convert); @@ -890,6 +976,7 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp buildNameTranslator(), buildAccessTranslator(), buildMutableTranslator(), + buildAttributeTypeTranslator(), buildColumnTranslator(), buildTemporalTranslator(), buildConvertTranslator(), @@ -933,4 +1020,9 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp protected static Translator buildAccessMethodsTranslator() { return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods()); } + + protected static Translator buildAttributeTypeTranslator() { + return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlVersion_2_1_AttributeType(), Translator.DOM_ATTRIBUTE); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java new file mode 100644 index 0000000000..ef794a0cfe --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java @@ -0,0 +1,266 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.emf.common.util.Enumerator; + +/** + * <!-- begin-user-doc --> + * A representation of the literals of the enumeration '<em><b>Batch Fetch Type 21</b></em>', + * and utility methods for working with them. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getBatchFetchType_2_1() + * @model + * @generated + */ +public enum BatchFetchType_2_1 implements Enumerator +{ + /** + * The '<em><b>JOIN</b></em>' literal object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #JOIN_VALUE + * @generated + * @ordered + */ + JOIN(0, "JOIN", "JOIN"), + + /** + * The '<em><b>EXISTS</b></em>' literal object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #EXISTS_VALUE + * @generated + * @ordered + */ + EXISTS(1, "EXISTS", "EXISTS"), + + /** + * The '<em><b>IN</b></em>' literal object. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #IN_VALUE + * @generated + * @ordered + */ + IN(2, "IN", "IN"); + + /** + * The '<em><b>JOIN</b></em>' literal value. + * <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>JOIN</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @see #JOIN + * @model + * @generated + * @ordered + */ + public static final int JOIN_VALUE = 0; + + /** + * The '<em><b>EXISTS</b></em>' literal value. + * <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>EXISTS</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @see #EXISTS + * @model + * @generated + * @ordered + */ + public static final int EXISTS_VALUE = 1; + + /** + * The '<em><b>IN</b></em>' literal value. + * <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>IN</b></em>' literal object isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @see #IN + * @model + * @generated + * @ordered + */ + public static final int IN_VALUE = 2; + + /** + * An array of all the '<em><b>Batch Fetch Type 21</b></em>' enumerators. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private static final BatchFetchType_2_1[] VALUES_ARRAY = + new BatchFetchType_2_1[] + { + JOIN, + EXISTS, + IN, + }; + + /** + * A public read-only list of all the '<em><b>Batch Fetch Type 21</b></em>' enumerators. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final List<BatchFetchType_2_1> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); + + /** + * Returns the '<em><b>Batch Fetch Type 21</b></em>' literal with the specified literal value. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static BatchFetchType_2_1 get(String literal) + { + for (int i = 0; i < VALUES_ARRAY.length; ++i) + { + BatchFetchType_2_1 result = VALUES_ARRAY[i]; + if (result.toString().equals(literal)) + { + return result; + } + } + return null; + } + + /** + * Returns the '<em><b>Batch Fetch Type 21</b></em>' literal with the specified name. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static BatchFetchType_2_1 getByName(String name) + { + for (int i = 0; i < VALUES_ARRAY.length; ++i) + { + BatchFetchType_2_1 result = VALUES_ARRAY[i]; + if (result.getName().equals(name)) + { + return result; + } + } + return null; + } + + /** + * Returns the '<em><b>Batch Fetch Type 21</b></em>' literal with the specified integer value. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static BatchFetchType_2_1 get(int value) + { + switch (value) + { + case JOIN_VALUE: return JOIN; + case EXISTS_VALUE: return EXISTS; + case IN_VALUE: return IN; + } + return null; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private final int value; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private final String name; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private final String literal; + + /** + * Only this class can construct instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private BatchFetchType_2_1(int value, String name, String literal) + { + this.value = value; + this.name = name; + this.literal = literal; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public int getValue() + { + return value; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getName() + { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getLiteral() + { + return literal; + } + + /** + * Returns the literal value of the enumerator, which is its string representation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() + { + return literal; + } + +} //BatchFetchType_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java index b1a6c7db4b..d5df45801f 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java @@ -1,18 +1,18 @@ /******************************************************************************* - * Copyright (c) 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLink; import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; +@SuppressWarnings("nls") public interface EclipseLink2_1 extends EclipseLink2_0 { @@ -24,6 +24,10 @@ public interface EclipseLink2_1 // EclipseLink 2.1 specific nodes String ATTRIBUTE = "attribute"; + String ATTRIBUTE_TYPE = "attribute-type"; + String BATCH_FETCH = "batch-fetch"; + String BATCH_FETCH__SIZE = "size"; + String BATCH_FETCH__TYPE = "type"; String CACHE_KEY_TYPE = "cache-key-type"; String CLASS_EXTRACTOR = "class-extractor"; String FETCH_GROUP = "fetch-group"; diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java index e5b91ca2e7..175f351c74 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java @@ -97,6 +97,8 @@ public class EclipseLinkOrmV2_1Factory extends EFactoryImpl { case EclipseLinkOrmV2_1Package.CACHE_KEY_TYPE_21: return createCacheKeyType_2_1FromString(eDataType, initialValue); + case EclipseLinkOrmV2_1Package.BATCH_FETCH_TYPE_21: + return createBatchFetchType_2_1FromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -114,6 +116,8 @@ public class EclipseLinkOrmV2_1Factory extends EFactoryImpl { case EclipseLinkOrmV2_1Package.CACHE_KEY_TYPE_21: return convertCacheKeyType_2_1ToString(eDataType, instanceValue); + case EclipseLinkOrmV2_1Package.BATCH_FETCH_TYPE_21: + return convertBatchFetchType_2_1ToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -146,6 +150,28 @@ public class EclipseLinkOrmV2_1Factory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ + public BatchFetchType_2_1 createBatchFetchType_2_1FromString(EDataType eDataType, String initialValue) + { + BatchFetchType_2_1 result = BatchFetchType_2_1.get(initialValue); + if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + return result; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String convertBatchFetchType_2_1ToString(EDataType eDataType, Object instanceValue) + { + return instanceValue == null ? null : instanceValue.toString(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EclipseLinkOrmV2_1Package getEclipseLinkOrmV2_1Package() { return (EclipseLinkOrmV2_1Package)getEPackage(); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java index 0ff4348062..51c40804cf 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java @@ -129,41 +129,199 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final int XML_BASIC_21__RETURN_UPDATE = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 1; /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BASIC_21__ATTRIBUTE_TYPE = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Xml Basic 21</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_BASIC_21_FEATURE_COUNT = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 2; + public static final int XML_BASIC_21_FEATURE_COUNT = EclipseLinkOrmV1_1Package.XML_BASIC_11_FEATURE_COUNT + 3; /** - * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 <em>Xml Batch Fetch 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 - * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1() + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1() * @generated */ - public static final int XML_FETCH_GROUP_CONTAINER_21 = 4; + public static final int XML_BATCH_FETCH_21 = 1; /** - * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list. + * The feature id for the '<em><b>Size</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = 0; + public static final int XML_BATCH_FETCH_21__SIZE = 0; /** - * The number of structural features of the '<em>Xml Fetch Group Container 21</em>' class. + * The feature id for the '<em><b>Batch Fetch Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT = 1; + public static final int XML_BATCH_FETCH_21__BATCH_FETCH_TYPE = 1; + + /** + * The number of structural features of the '<em>Xml Batch Fetch 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_BATCH_FETCH_21_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 <em>Xml Element Collection 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1() + * @generated + */ + public static final int XML_ELEMENT_COLLECTION_21 = 2; + + /** + * The feature id for the '<em><b>Join Fetch</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION_21__JOIN_FETCH = EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH; + + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_JOIN_FETCH_FEATURE_COUNT + 0; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE = EclipseLinkOrmPackage.XML_JOIN_FETCH_FEATURE_COUNT + 1; + + /** + * The number of structural features of the '<em>Xml Element Collection 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_JOIN_FETCH_FEATURE_COUNT + 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 <em>Xml Embeddable 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddable_2_1() + * @generated + */ + public static final int XML_EMBEDDABLE_21 = 3; + + /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDABLE_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + + /** + * The number of structural features of the '<em>Xml Embeddable 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDABLE_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 <em>Xml Embedded 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1() + * @generated + */ + public static final int XML_EMBEDDED_21 = 4; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDED_21__ATTRIBUTE_TYPE = 0; + + /** + * The number of structural features of the '<em>Xml Embedded 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDED_21_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 <em>Xml Embedded Id 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1() + * @generated + */ + public static final int XML_EMBEDDED_ID_21 = 5; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE = 0; + + /** + * The number of structural features of the '<em>Xml Embedded Id 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_EMBEDDED_ID_21_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1() + * @generated + */ + public static final int XML_FETCH_GROUP_CONTAINER_21 = 10; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}' class. @@ -173,7 +331,16 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1() * @generated */ - public static final int XML_ENTITY_21 = 1; + public static final int XML_ENTITY_21 = 6; + + /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ENTITY_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; /** * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list. @@ -182,7 +349,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY_21__FETCH_GROUPS = XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS; + public static final int XML_ENTITY_21__FETCH_GROUPS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Class Extractor</b></em>' containment reference. @@ -191,7 +358,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY_21__CLASS_EXTRACTOR = XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT + 0; + public static final int XML_ENTITY_21__CLASS_EXTRACTOR = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Xml Entity 21</em>' class. @@ -200,7 +367,35 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_ENTITY_21_FEATURE_COUNT = XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT + 1; + public static final int XML_ENTITY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntityMappings_2_1() + * @generated + */ + public static final int XML_ENTITY_MAPPINGS_21 = 7; + + /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ENTITY_MAPPINGS_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + + /** + * The number of structural features of the '<em>Xml Entity Mappings 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ENTITY_MAPPINGS_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}' class. @@ -210,7 +405,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1() * @generated */ - public static final int XML_FETCH_ATTRIBUTE_21 = 2; + public static final int XML_FETCH_ATTRIBUTE_21 = 8; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -238,7 +433,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1() * @generated */ - public static final int XML_FETCH_GROUP_21 = 3; + public static final int XML_FETCH_GROUP_21 = 9; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -268,6 +463,117 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final int XML_FETCH_GROUP_21_FEATURE_COUNT = 2; /** + * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = 0; + + /** + * The number of structural features of the '<em>Xml Fetch Group Container 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1 <em>Xml Id 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1() + * @generated + */ + public static final int XML_ID_21 = 11; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ID_21__ATTRIBUTE_TYPE = 0; + + /** + * The number of structural features of the '<em>Xml Id 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ID_21_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 <em>Xml Many To Many 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1() + * @generated + */ + public static final int XML_MANY_TO_MANY_21 = 12; + + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Xml Many To Many 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 <em>Xml Many To One 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToOne_2_1() + * @generated + */ + public static final int XML_MANY_TO_ONE_21 = 13; + + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_ONE_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + + /** + * The number of structural features of the '<em>Xml Many To One 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MANY_TO_ONE_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0; + + /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -275,7 +581,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1() * @generated */ - public static final int XML_MAPPED_SUPERCLASS_21 = 5; + public static final int XML_MAPPED_SUPERCLASS_21 = 14; /** * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list. @@ -350,13 +656,22 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final int XML_MAPPED_SUPERCLASS_21__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 6; /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS_21__ACCESS_METHODS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 7; + + /** * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 7; + public static final int XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 8; /** * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference. @@ -365,7 +680,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 8; + public static final int XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 9; /** * The number of structural features of the '<em>Xml Mapped Superclass 21</em>' class. @@ -374,7 +689,100 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_21_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 9; + public static final int XML_MAPPED_SUPERCLASS_21_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 10; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1() + * @generated + */ + public static final int XML_ONE_TO_MANY_21 = 15; + + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Xml One To Many 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 <em>Xml One To One 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToOne_2_1() + * @generated + */ + public static final int XML_ONE_TO_ONE_21 = 16; + + /** + * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_ONE_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH; + + /** + * The number of structural features of the '<em>Xml One To One 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_ONE_TO_ONE_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 <em>Xml Persistence Unit Defaults 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPersistenceUnitDefaults_2_1() + * @generated + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_21 = 17; + + /** + * The feature id for the '<em><b>Access Methods</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; + + /** + * The number of structural features of the '<em>Xml Persistence Unit Defaults 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}' class. @@ -384,25 +792,27 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1() * @generated */ - public static final int XML_RETURN_INSERT_21 = 6; + public static final int XML_RETURN_INSERT_21 = 19; /** - * The feature id for the '<em><b>Return Only</b></em>' attribute. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 <em>Xml Transformation 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1() * @generated - * @ordered */ - public static final int XML_RETURN_INSERT_21__RETURN_ONLY = 0; + public static final int XML_TRANSFORMATION_21 = 20; /** - * The number of structural features of the '<em>Xml Return Insert 21</em>' class. + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 <em>Xml Version 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1() * @generated - * @ordered */ - public static final int XML_RETURN_INSERT_21_FEATURE_COUNT = 1; + public static final int XML_VERSION_21 = 21; /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}' class. @@ -412,7 +822,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1() * @generated */ - public static final int XML_PRIMARY_KEY_21 = 7; + public static final int XML_PRIMARY_KEY_21 = 18; /** * The feature id for the '<em><b>Cache Key Type</b></em>' attribute. @@ -433,6 +843,60 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final int XML_PRIMARY_KEY_21_FEATURE_COUNT = 1; /** + * The feature id for the '<em><b>Return Only</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_RETURN_INSERT_21__RETURN_ONLY = 0; + + /** + * The number of structural features of the '<em>Xml Return Insert 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_RETURN_INSERT_21_FEATURE_COUNT = 1; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_TRANSFORMATION_21__ATTRIBUTE_TYPE = 0; + + /** + * The number of structural features of the '<em>Xml Transformation 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_TRANSFORMATION_21_FEATURE_COUNT = 1; + + /** + * The feature id for the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_VERSION_21__ATTRIBUTE_TYPE = 0; + + /** + * The number of structural features of the '<em>Xml Version 21</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int XML_VERSION_21_FEATURE_COUNT = 1; + + /** * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -440,7 +904,17 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1() * @generated */ - public static final int CACHE_KEY_TYPE_21 = 8; + public static final int CACHE_KEY_TYPE_21 = 22; + + /** + * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 <em>Batch Fetch Type 21</em>}' enum. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getBatchFetchType_2_1() + * @generated + */ + public static final int BATCH_FETCH_TYPE_21 = 23; /** * <!-- begin-user-doc --> @@ -454,6 +928,41 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlBatchFetch_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlElementCollection_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlEmbeddable_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlEmbedded_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlEmbeddedId_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlEntity_2_1EClass = null; /** @@ -461,6 +970,13 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlEntityMappings_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlFetchAttribute_2_1EClass = null; /** @@ -482,6 +998,27 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlId_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlManyToMany_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlManyToOne_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlMappedSuperclass_2_1EClass = null; /** @@ -489,6 +1026,27 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlOneToMany_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlOneToOne_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlPersistenceUnitDefaults_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlReturnInsert_2_1EClass = null; /** @@ -496,6 +1054,20 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ + private EClass xmlTransformation_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass xmlVersion_2_1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EClass xmlPrimaryKey_2_1EClass = null; /** @@ -506,6 +1078,13 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl private EEnum cacheKeyType_2_1EEnum = null; /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EEnum batchFetchType_2_1EEnum = null; + + /** * Creates an instance of the model <b>Package</b>, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. @@ -627,6 +1206,166 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl } /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType() + * @see #getXmlBasic_2_1() + * @generated + */ + public EAttribute getXmlBasic_2_1_AttributeType() + { + return (EAttribute)xmlBasic_2_1EClass.getEStructuralFeatures().get(2); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 <em>Xml Batch Fetch 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Batch Fetch 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 + * @generated + */ + public EClass getXmlBatchFetch_2_1() + { + return xmlBatchFetch_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize <em>Size</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Size</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize() + * @see #getXmlBatchFetch_2_1() + * @generated + */ + public EAttribute getXmlBatchFetch_2_1_Size() + { + return (EAttribute)xmlBatchFetch_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType <em>Batch Fetch Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Batch Fetch Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType() + * @see #getXmlBatchFetch_2_1() + * @generated + */ + public EAttribute getXmlBatchFetch_2_1_BatchFetchType() + { + return (EAttribute)xmlBatchFetch_2_1EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 <em>Xml Element Collection 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Element Collection 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 + * @generated + */ + public EClass getXmlElementCollection_2_1() + { + return xmlElementCollection_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType() + * @see #getXmlElementCollection_2_1() + * @generated + */ + public EAttribute getXmlElementCollection_2_1_AttributeType() + { + return (EAttribute)xmlElementCollection_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 <em>Xml Embeddable 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Embeddable 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 + * @generated + */ + public EClass getXmlEmbeddable_2_1() + { + return xmlEmbeddable_2_1EClass; + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 <em>Xml Embedded 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Embedded 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 + * @generated + */ + public EClass getXmlEmbedded_2_1() + { + return xmlEmbedded_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType() + * @see #getXmlEmbedded_2_1() + * @generated + */ + public EAttribute getXmlEmbedded_2_1_AttributeType() + { + return (EAttribute)xmlEmbedded_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 <em>Xml Embedded Id 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Embedded Id 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 + * @generated + */ + public EClass getXmlEmbeddedId_2_1() + { + return xmlEmbeddedId_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType() + * @see #getXmlEmbeddedId_2_1() + * @generated + */ + public EAttribute getXmlEmbeddedId_2_1_AttributeType() + { + return (EAttribute)xmlEmbeddedId_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -654,6 +1393,20 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Entity Mappings 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 + * @generated + */ + public EClass getXmlEntityMappings_2_1() + { + return xmlEntityMappings_2_1EClass; + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -749,6 +1502,78 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1 <em>Xml Id 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Id 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1 + * @generated + */ + public EClass getXmlId_2_1() + { + return xmlId_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType() + * @see #getXmlId_2_1() + * @generated + */ + public EAttribute getXmlId_2_1_AttributeType() + { + return (EAttribute)xmlId_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 <em>Xml Many To Many 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Many To Many 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 + * @generated + */ + public EClass getXmlManyToMany_2_1() + { + return xmlManyToMany_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType() + * @see #getXmlManyToMany_2_1() + * @generated + */ + public EAttribute getXmlManyToMany_2_1_AttributeType() + { + return (EAttribute)xmlManyToMany_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 <em>Xml Many To One 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Many To One 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 + * @generated + */ + public EClass getXmlManyToOne_2_1() + { + return xmlManyToOne_2_1EClass; + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -790,6 +1615,63 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml One To Many 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 + * @generated + */ + public EClass getXmlOneToMany_2_1() + { + return xmlOneToMany_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType() + * @see #getXmlOneToMany_2_1() + * @generated + */ + public EAttribute getXmlOneToMany_2_1_AttributeType() + { + return (EAttribute)xmlOneToMany_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 <em>Xml One To One 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml One To One 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 + * @generated + */ + public EClass getXmlOneToOne_2_1() + { + return xmlOneToOne_2_1EClass; + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 <em>Xml Persistence Unit Defaults 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Persistence Unit Defaults 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 + * @generated + */ + public EClass getXmlPersistenceUnitDefaults_2_1() + { + return xmlPersistenceUnitDefaults_2_1EClass; + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -817,6 +1699,64 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl } /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 <em>Xml Transformation 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Transformation 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 + * @generated + */ + public EClass getXmlTransformation_2_1() + { + return xmlTransformation_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType() + * @see #getXmlTransformation_2_1() + * @generated + */ + public EAttribute getXmlTransformation_2_1_AttributeType() + { + return (EAttribute)xmlTransformation_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 <em>Xml Version 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Xml Version 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 + * @generated + */ + public EClass getXmlVersion_2_1() + { + return xmlVersion_2_1EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType <em>Attribute Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Attribute Type</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType() + * @see #getXmlVersion_2_1() + * @generated + */ + public EAttribute getXmlVersion_2_1_AttributeType() + { + return (EAttribute)xmlVersion_2_1EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -857,6 +1797,20 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl } /** + * Returns the meta object for enum '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 <em>Batch Fetch Type 21</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for enum '<em>Batch Fetch Type 21</em>'. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @generated + */ + public EEnum getBatchFetchType_2_1() + { + return batchFetchType_2_1EEnum; + } + + + /** * Returns the factory that creates the instances of the model. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -891,10 +1845,28 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl xmlBasic_2_1EClass = createEClass(XML_BASIC_21); createEReference(xmlBasic_2_1EClass, XML_BASIC_21__RETURN_INSERT); createEAttribute(xmlBasic_2_1EClass, XML_BASIC_21__RETURN_UPDATE); + createEAttribute(xmlBasic_2_1EClass, XML_BASIC_21__ATTRIBUTE_TYPE); + + xmlBatchFetch_2_1EClass = createEClass(XML_BATCH_FETCH_21); + createEAttribute(xmlBatchFetch_2_1EClass, XML_BATCH_FETCH_21__SIZE); + createEAttribute(xmlBatchFetch_2_1EClass, XML_BATCH_FETCH_21__BATCH_FETCH_TYPE); + + xmlElementCollection_2_1EClass = createEClass(XML_ELEMENT_COLLECTION_21); + createEAttribute(xmlElementCollection_2_1EClass, XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE); + + xmlEmbeddable_2_1EClass = createEClass(XML_EMBEDDABLE_21); + + xmlEmbedded_2_1EClass = createEClass(XML_EMBEDDED_21); + createEAttribute(xmlEmbedded_2_1EClass, XML_EMBEDDED_21__ATTRIBUTE_TYPE); + + xmlEmbeddedId_2_1EClass = createEClass(XML_EMBEDDED_ID_21); + createEAttribute(xmlEmbeddedId_2_1EClass, XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE); xmlEntity_2_1EClass = createEClass(XML_ENTITY_21); createEReference(xmlEntity_2_1EClass, XML_ENTITY_21__CLASS_EXTRACTOR); + xmlEntityMappings_2_1EClass = createEClass(XML_ENTITY_MAPPINGS_21); + xmlFetchAttribute_2_1EClass = createEClass(XML_FETCH_ATTRIBUTE_21); createEAttribute(xmlFetchAttribute_2_1EClass, XML_FETCH_ATTRIBUTE_21__NAME); @@ -905,18 +1877,40 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl xmlFetchGroupContainer_2_1EClass = createEClass(XML_FETCH_GROUP_CONTAINER_21); createEReference(xmlFetchGroupContainer_2_1EClass, XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS); + xmlId_2_1EClass = createEClass(XML_ID_21); + createEAttribute(xmlId_2_1EClass, XML_ID_21__ATTRIBUTE_TYPE); + + xmlManyToMany_2_1EClass = createEClass(XML_MANY_TO_MANY_21); + createEAttribute(xmlManyToMany_2_1EClass, XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE); + + xmlManyToOne_2_1EClass = createEClass(XML_MANY_TO_ONE_21); + xmlMappedSuperclass_2_1EClass = createEClass(XML_MAPPED_SUPERCLASS_21); createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS); createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS); - xmlReturnInsert_2_1EClass = createEClass(XML_RETURN_INSERT_21); - createEAttribute(xmlReturnInsert_2_1EClass, XML_RETURN_INSERT_21__RETURN_ONLY); + xmlOneToMany_2_1EClass = createEClass(XML_ONE_TO_MANY_21); + createEAttribute(xmlOneToMany_2_1EClass, XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE); + + xmlOneToOne_2_1EClass = createEClass(XML_ONE_TO_ONE_21); + + xmlPersistenceUnitDefaults_2_1EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_21); xmlPrimaryKey_2_1EClass = createEClass(XML_PRIMARY_KEY_21); createEAttribute(xmlPrimaryKey_2_1EClass, XML_PRIMARY_KEY_21__CACHE_KEY_TYPE); + xmlReturnInsert_2_1EClass = createEClass(XML_RETURN_INSERT_21); + createEAttribute(xmlReturnInsert_2_1EClass, XML_RETURN_INSERT_21__RETURN_ONLY); + + xmlTransformation_2_1EClass = createEClass(XML_TRANSFORMATION_21); + createEAttribute(xmlTransformation_2_1EClass, XML_TRANSFORMATION_21__ATTRIBUTE_TYPE); + + xmlVersion_2_1EClass = createEClass(XML_VERSION_21); + createEAttribute(xmlVersion_2_1EClass, XML_VERSION_21__ATTRIBUTE_TYPE); + // Create enums cacheKeyType_2_1EEnum = createEEnum(CACHE_KEY_TYPE_21); + batchFetchType_2_1EEnum = createEEnum(BATCH_FETCH_TYPE_21); } /** @@ -955,22 +1949,51 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl // Add supertypes to classes xmlBasic_2_1EClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlBasic_1_1()); + xmlElementCollection_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlJoinFetch()); + xmlElementCollection_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder()); + xmlEmbeddable_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder()); + xmlEntity_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder()); xmlEntity_2_1EClass.getESuperTypes().add(this.getXmlFetchGroupContainer_2_1()); + xmlEntityMappings_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder()); + xmlManyToMany_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder()); + xmlManyToOne_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder()); xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer()); xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlAttributeOverrideContainer()); xmlMappedSuperclass_2_1EClass.getESuperTypes().add(this.getXmlFetchGroupContainer_2_1()); xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlGeneratorContainer()); xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlQueryContainer()); xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlQueryContainer()); + xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder()); + xmlOneToMany_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder()); + xmlOneToOne_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder()); + xmlPersistenceUnitDefaults_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder()); // Initialize classes and features; add operations and parameters initEClass(xmlBasic_2_1EClass, XmlBasic_2_1.class, "XmlBasic_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlBasic_2_1_ReturnInsert(), theEclipseLinkOrmPackage.getXmlReturnInsert(), null, "returnInsert", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlBasic_2_1_ReturnUpdate(), theXMLTypePackage.getBooleanObject(), "returnUpdate", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlBasic_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlBatchFetch_2_1EClass, XmlBatchFetch_2_1.class, "XmlBatchFetch_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlBatchFetch_2_1_Size(), theXMLTypePackage.getIntObject(), "size", null, 0, 1, XmlBatchFetch_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlBatchFetch_2_1_BatchFetchType(), this.getBatchFetchType_2_1(), "batchFetchType", null, 0, 1, XmlBatchFetch_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlElementCollection_2_1EClass, XmlElementCollection_2_1.class, "XmlElementCollection_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlElementCollection_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlEmbeddable_2_1EClass, XmlEmbeddable_2_1.class, "XmlEmbeddable_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(xmlEmbedded_2_1EClass, XmlEmbedded_2_1.class, "XmlEmbedded_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlEmbedded_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlEmbedded_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlEmbeddedId_2_1EClass, XmlEmbeddedId_2_1.class, "XmlEmbeddedId_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlEmbeddedId_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlEmbeddedId_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlEntity_2_1EClass, XmlEntity_2_1.class, "XmlEntity_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlEntity_2_1_ClassExtractor(), theOrmPackage.getXmlClassReference(), null, "classExtractor", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlEntityMappings_2_1EClass, XmlEntityMappings_2_1.class, "XmlEntityMappings_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlFetchAttribute_2_1EClass, XmlFetchAttribute_2_1.class, "XmlFetchAttribute_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlFetchAttribute_2_1_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlFetchAttribute_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -981,21 +2004,47 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl initEClass(xmlFetchGroupContainer_2_1EClass, XmlFetchGroupContainer_2_1.class, "XmlFetchGroupContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlFetchGroupContainer_2_1_FetchGroups(), theEclipseLinkOrmPackage.getXmlFetchGroup(), null, "fetchGroups", null, 0, -1, XmlFetchGroupContainer_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlId_2_1EClass, XmlId_2_1.class, "XmlId_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlId_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlId_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlManyToMany_2_1EClass, XmlManyToMany_2_1.class, "XmlManyToMany_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlManyToMany_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlManyToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlManyToOne_2_1EClass, XmlManyToOne_2_1.class, "XmlManyToOne_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlMappedSuperclass_2_1EClass, XmlMappedSuperclass_2_1.class, "XmlMappedSuperclass_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlMappedSuperclass_2_1_SqlResultSetMappings(), theOrmPackage.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlMappedSuperclass_2_1_QueryRedirectors(), theEclipseLinkOrmPackage.getXmlQueryRedirectors(), null, "queryRedirectors", null, 0, 1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlReturnInsert_2_1EClass, XmlReturnInsert_2_1.class, "XmlReturnInsert_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlReturnInsert_2_1_ReturnOnly(), theXMLTypePackage.getBooleanObject(), "returnOnly", null, 0, 1, XmlReturnInsert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlOneToMany_2_1EClass, XmlOneToMany_2_1.class, "XmlOneToMany_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlOneToMany_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlOneToOne_2_1EClass, XmlOneToOne_2_1.class, "XmlOneToOne_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + + initEClass(xmlPersistenceUnitDefaults_2_1EClass, XmlPersistenceUnitDefaults_2_1.class, "XmlPersistenceUnitDefaults_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlPrimaryKey_2_1EClass, XmlPrimaryKey_2_1.class, "XmlPrimaryKey_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlPrimaryKey_2_1_CacheKeyType(), this.getCacheKeyType_2_1(), "cacheKeyType", null, 0, 1, XmlPrimaryKey_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlReturnInsert_2_1EClass, XmlReturnInsert_2_1.class, "XmlReturnInsert_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlReturnInsert_2_1_ReturnOnly(), theXMLTypePackage.getBooleanObject(), "returnOnly", null, 0, 1, XmlReturnInsert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlTransformation_2_1EClass, XmlTransformation_2_1.class, "XmlTransformation_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlTransformation_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlTransformation_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlVersion_2_1EClass, XmlVersion_2_1.class, "XmlVersion_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlVersion_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlVersion_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + // Initialize enums and add enum literals initEEnum(cacheKeyType_2_1EEnum, CacheKeyType_2_1.class, "CacheKeyType_2_1"); addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.ID_VALUE); addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.CACHE_KEY); addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.AUTO); + + initEEnum(batchFetchType_2_1EEnum, BatchFetchType_2_1.class, "BatchFetchType_2_1"); + addEEnumLiteral(batchFetchType_2_1EEnum, BatchFetchType_2_1.JOIN); + addEEnumLiteral(batchFetchType_2_1EEnum, BatchFetchType_2_1.EXISTS); + addEEnumLiteral(batchFetchType_2_1EEnum, BatchFetchType_2_1.IN); } /** @@ -1039,6 +2088,104 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final EAttribute XML_BASIC_21__RETURN_UPDATE = eINSTANCE.getXmlBasic_2_1_ReturnUpdate(); /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_BASIC_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlBasic_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 <em>Xml Batch Fetch 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1() + * @generated + */ + public static final EClass XML_BATCH_FETCH_21 = eINSTANCE.getXmlBatchFetch_2_1(); + + /** + * The meta object literal for the '<em><b>Size</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_BATCH_FETCH_21__SIZE = eINSTANCE.getXmlBatchFetch_2_1_Size(); + + /** + * The meta object literal for the '<em><b>Batch Fetch Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_BATCH_FETCH_21__BATCH_FETCH_TYPE = eINSTANCE.getXmlBatchFetch_2_1_BatchFetchType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 <em>Xml Element Collection 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1() + * @generated + */ + public static final EClass XML_ELEMENT_COLLECTION_21 = eINSTANCE.getXmlElementCollection_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlElementCollection_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 <em>Xml Embeddable 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddable_2_1() + * @generated + */ + public static final EClass XML_EMBEDDABLE_21 = eINSTANCE.getXmlEmbeddable_2_1(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 <em>Xml Embedded 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1() + * @generated + */ + public static final EClass XML_EMBEDDED_21 = eINSTANCE.getXmlEmbedded_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_EMBEDDED_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlEmbedded_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 <em>Xml Embedded Id 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1() + * @generated + */ + public static final EClass XML_EMBEDDED_ID_21 = eINSTANCE.getXmlEmbeddedId_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlEmbeddedId_2_1_AttributeType(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1057,6 +2204,16 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final EReference XML_ENTITY_21__CLASS_EXTRACTOR = eINSTANCE.getXmlEntity_2_1_ClassExtractor(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntityMappings_2_1() + * @generated + */ + public static final EClass XML_ENTITY_MAPPINGS_21 = eINSTANCE.getXmlEntityMappings_2_1(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1119,6 +2276,52 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final EReference XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1 <em>Xml Id 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1() + * @generated + */ + public static final EClass XML_ID_21 = eINSTANCE.getXmlId_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_ID_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlId_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 <em>Xml Many To Many 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1() + * @generated + */ + public static final EClass XML_MANY_TO_MANY_21 = eINSTANCE.getXmlManyToMany_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlManyToMany_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 <em>Xml Many To One 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToOne_2_1() + * @generated + */ + public static final EClass XML_MANY_TO_ONE_21 = eINSTANCE.getXmlManyToOne_2_1(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1145,6 +2348,44 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final EReference XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = eINSTANCE.getXmlMappedSuperclass_2_1_QueryRedirectors(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1() + * @generated + */ + public static final EClass XML_ONE_TO_MANY_21 = eINSTANCE.getXmlOneToMany_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlOneToMany_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 <em>Xml One To One 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToOne_2_1() + * @generated + */ + public static final EClass XML_ONE_TO_ONE_21 = eINSTANCE.getXmlOneToOne_2_1(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 <em>Xml Persistence Unit Defaults 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPersistenceUnitDefaults_2_1() + * @generated + */ + public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS_21 = eINSTANCE.getXmlPersistenceUnitDefaults_2_1(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1163,6 +2404,42 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl public static final EAttribute XML_RETURN_INSERT_21__RETURN_ONLY = eINSTANCE.getXmlReturnInsert_2_1_ReturnOnly(); /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 <em>Xml Transformation 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1() + * @generated + */ + public static final EClass XML_TRANSFORMATION_21 = eINSTANCE.getXmlTransformation_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_TRANSFORMATION_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlTransformation_2_1_AttributeType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 <em>Xml Version 21</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1() + * @generated + */ + public static final EClass XML_VERSION_21 = eINSTANCE.getXmlVersion_2_1(); + + /** + * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EAttribute XML_VERSION_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlVersion_2_1_AttributeType(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1190,6 +2467,16 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl */ public static final EEnum CACHE_KEY_TYPE_21 = eINSTANCE.getCacheKeyType_2_1(); + /** + * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 <em>Batch Fetch Type 21</em>}' enum. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getBatchFetchType_2_1() + * @generated + */ + public static final EEnum BATCH_FETCH_TYPE_21 = eINSTANCE.getBatchFetchType_2_1(); + } } //EclipseLinkOrmV2_1Package diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java index e9ad3cf974..b09b374ac6 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java @@ -17,6 +17,15 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Basic 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 * <!-- end-user-doc --> * * <p> @@ -24,6 +33,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1; * <ul> * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}</li> * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType <em>Attribute Type</em>}</li> * </ul> * </p> * @@ -85,4 +95,30 @@ public interface XmlBasic_2_1 extends XmlBasic_1_1 */ void setReturnUpdate(Boolean value); + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + } // XmlBasic_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java new file mode 100644 index 0000000000..7765f92797 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Batch Fetch 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize <em>Size</em>}</li> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType <em>Batch Fetch Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlBatchFetch_2_1 extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Size</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Size</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Size</em>' attribute. + * @see #setSize(Integer) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1_Size() + * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" + * @generated + */ + Integer getSize(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize <em>Size</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Size</em>' attribute. + * @see #getSize() + * @generated + */ + void setSize(Integer value); + + /** + * Returns the value of the '<em><b>Batch Fetch Type</b></em>' attribute. + * The literals are from the enumeration {@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Batch Fetch Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Batch Fetch Type</em>' attribute. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @see #setBatchFetchType(BatchFetchType_2_1) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1_BatchFetchType() + * @model + * @generated + */ + BatchFetchType_2_1 getBatchFetchType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType <em>Batch Fetch Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Batch Fetch Type</em>' attribute. + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 + * @see #getBatchFetchType() + * @generated + */ + void setBatchFetchType(BatchFetchType_2_1 value); + +} // XmlBatchFetch_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlElementCollection_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlElementCollection_2_1.java new file mode 100644 index 0000000000..aa8dc9e3e1 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlElementCollection_2_1.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder; +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Element Collection 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlElementCollection_2_1 extends XmlJoinFetch, XmlBatchFetchHolder +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlElementCollection_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbeddable_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbeddable_2_1.java new file mode 100644 index 0000000000..3151e317f7 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbeddable_2_1.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Embeddable 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddable_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlEmbeddable_2_1 extends XmlAccessMethodsHolder +{ +} // XmlEmbeddable_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbeddedId_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbeddedId_2_1.java new file mode 100644 index 0000000000..0d38c5c7c6 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbeddedId_2_1.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Embedded Id 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlEmbeddedId_2_1 extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlEmbeddedId_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbedded_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbedded_2_1.java new file mode 100644 index 0000000000..b6d996fe89 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEmbedded_2_1.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Embedded 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlEmbedded_2_1 extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlEmbedded_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntityMappings_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntityMappings_2_1.java new file mode 100644 index 0000000000..14bd37b468 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntityMappings_2_1.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Entity Mappings 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntityMappings_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlEntityMappings_2_1 extends XmlAccessMethodsHolder +{ +} // XmlEntityMappings_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java index a1a37a2a41..4ee2099d06 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java @@ -12,10 +12,20 @@ package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; import org.eclipse.jpt.core.resource.orm.XmlClassReference; +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Entity 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 * <!-- end-user-doc --> * * <p> @@ -29,7 +39,7 @@ import org.eclipse.jpt.core.resource.orm.XmlClassReference; * @model kind="class" interface="true" abstract="true" * @generated */ -public interface XmlEntity_2_1 extends XmlFetchGroupContainer_2_1 +public interface XmlEntity_2_1 extends XmlAccessMethodsHolder, XmlFetchGroupContainer_2_1 { /** * Returns the value of the '<em><b>Class Extractor</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlId_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlId_2_1.java new file mode 100644 index 0000000000..7bb2b43f19 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlId_2_1.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Id 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlId_2_1 extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlId_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlManyToMany_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlManyToMany_2_1.java new file mode 100644 index 0000000000..aa1b5c34d2 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlManyToMany_2_1.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Many To Many 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlManyToMany_2_1 extends XmlBatchFetchHolder +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlManyToMany_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlManyToOne_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlManyToOne_2_1.java new file mode 100644 index 0000000000..230718affd --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlManyToOne_2_1.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Many To One 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToOne_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlManyToOne_2_1 extends XmlBatchFetchHolder +{ +} // XmlManyToOne_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java index f4c1359388..a456901e78 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java @@ -17,11 +17,21 @@ import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer; import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer; import org.eclipse.jpt.core.resource.orm.XmlGeneratorContainer; import org.eclipse.jpt.core.resource.orm.XmlQueryContainer; +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder; import org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryRedirectors; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Xml Mapped Superclass 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 * <!-- end-user-doc --> * * <p> @@ -36,7 +46,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryRedirectors; * @model kind="class" interface="true" abstract="true" * @generated */ -public interface XmlMappedSuperclass_2_1 extends XmlAssociationOverrideContainer, XmlAttributeOverrideContainer, XmlFetchGroupContainer_2_1, XmlGeneratorContainer, XmlQueryContainer, org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryContainer +public interface XmlMappedSuperclass_2_1 extends XmlAssociationOverrideContainer, XmlAttributeOverrideContainer, XmlFetchGroupContainer_2_1, XmlGeneratorContainer, XmlQueryContainer, org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryContainer, XmlAccessMethodsHolder { /** * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlOneToMany_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlOneToMany_2_1.java new file mode 100644 index 0000000000..0589bdbd96 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlOneToMany_2_1.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml One To Many 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlOneToMany_2_1 extends XmlBatchFetchHolder +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlOneToMany_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlOneToOne_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlOneToOne_2_1.java new file mode 100644 index 0000000000..8f2a160346 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlOneToOne_2_1.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBatchFetchHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml One To One 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToOne_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlOneToOne_2_1 extends XmlBatchFetchHolder +{ +} // XmlOneToOne_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPersistenceUnitDefaults_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPersistenceUnitDefaults_2_1.java new file mode 100644 index 0000000000..63ed04e53c --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlPersistenceUnitDefaults_2_1.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Persistence Unit Defaults 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPersistenceUnitDefaults_2_1() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlPersistenceUnitDefaults_2_1 extends XmlAccessMethodsHolder +{ +} // XmlPersistenceUnitDefaults_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlTransformation_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlTransformation_2_1.java new file mode 100644 index 0000000000..8b7819148a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlTransformation_2_1.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Transformation 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlTransformation_2_1 extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlTransformation_2_1 diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlVersion_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlVersion_2_1.java new file mode 100644 index 0000000000..b35165d23c --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlVersion_2_1.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.eclipselink.core.resource.orm.v2_1; + +import org.eclipse.jpt.core.resource.xml.JpaEObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Xml Version 21</b></em>'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @version 2.3 + * @since 2.3 + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType <em>Attribute Type</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1() + * @model kind="class" interface="true" abstract="true" + * @extends JpaEObject + * @generated + */ +public interface XmlVersion_2_1 extends JpaEObject +{ + /** + * Returns the value of the '<em><b>Attribute Type</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Attribute Type</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Attribute Type</em>' attribute. + * @see #setAttributeType(String) + * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1_AttributeType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getAttributeType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType <em>Attribute Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Attribute Type</em>' attribute. + * @see #getAttributeType() + * @generated + */ + void setAttributeType(String value); + +} // XmlVersion_2_1 |