diff options
| author | kmoore | 2011-07-25 12:00:06 +0000 |
|---|---|---|
| committer | kmoore | 2011-07-25 12:00:06 +0000 |
| commit | ca55b1123ccc8e947296fd8fc1300f0306429d21 (patch) | |
| tree | cb168f7b269d8f6b632933ef8532a826a633dbfc | |
| parent | 114d427a4f5d3a607a7745494dfdb250af532d88 (diff) | |
| download | webtools.dali-ca55b1123ccc8e947296fd8fc1300f0306429d21.tar.gz webtools.dali-ca55b1123ccc8e947296fd8fc1300f0306429d21.tar.xz webtools.dali-ca55b1123ccc8e947296fd8fc1300f0306429d21.zip | |
updated eclipselink-orm schema for tenant-discriminator-column mistake - bug 352676
13 files changed, 241 insertions, 331 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd index 3fa1b482d6..ebbc74c604 100644 --- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd +++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_3.xsd @@ -652,7 +652,7 @@ minOccurs="0"/> <xsd:element name="access-methods" type="orm:access-methods" minOccurs="0"/> - <xsd:element name="tenant-discriminator" type="orm:tenant-discriminator" + <xsd:element name="tenant-discriminator-column" type="orm:tenant-discriminator-column" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="converter" type="orm:converter" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="type-converter" type="orm:type-converter" minOccurs="0" maxOccurs="unbounded"/> @@ -818,7 +818,7 @@ minOccurs="0"/> <xsd:element name="cascade-persist" type="orm:emptyType" minOccurs="0"/> - <xsd:element name="tenant-discriminator" type="orm:tenant-discriminator" + <xsd:element name="tenant-discriminator-column" type="orm:tenant-discriminator-column" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="entity-listeners" type="orm:entity-listeners" minOccurs="0"/> @@ -2217,8 +2217,6 @@ <xsd:element name="batch-fetch" type="orm:batch-fetch" minOccurs="0"/> <xsd:element name="property" type="orm:property" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="access-methods" type="orm:access-methods" minOccurs="0"/> - - <xsd:element name="noncacheable" type="orm:emptyType" minOccurs="0"/> <xsd:group ref="orm:partitioning-group"/> </xsd:sequence> @@ -3312,7 +3310,7 @@ </xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="tenant-discriminator" type="orm:tenant-discriminator" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="tenant-discriminator-column" type="orm:tenant-discriminator-column" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="type" type="orm:multitenant-type"/> </xsd:complexType> @@ -5003,23 +5001,22 @@ <!-- **************************************************** --> - <xsd:complexType name="tenant-discriminator"> + <xsd:complexType name="tenant-discriminator-column"> <xsd:annotation> <xsd:documentation> - @Target({}) @Retention(RUNTIME) - public @interface TenantDiscriminator { + public @interface TenantDiscriminatorColumn { /** - * (Optional) The name of column to be used for the discriminator. + * (Optional) The name of column to be used for the tenant discriminator. */ - String name() default "eclipselink.tenant-id"; + String name() default "TENANT_ID"; /** * (Optional) The name of the context property to apply to the * tenant discriminator column. */ - String contextProperty() default "TENANT_ID"; + String contextProperty() default "eclipselink.tenant-id"; /** * (Optional) The type of object/column to use as a class discriminator. @@ -5053,15 +5050,14 @@ */ boolean primaryKey() default false; } - </xsd:documentation> </xsd:annotation> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="column-name" type="xsd:string"/> + <xsd:attribute name="context-property" type="xsd:string"/> <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/> <xsd:attribute name="column-definition" type="xsd:string"/> - <xsd:attribute name="table" type="xsd:string"/> <xsd:attribute name="length" type="xsd:int"/> + <xsd:attribute name="table" type="xsd:string"/> <xsd:attribute name="primary-key" type="xsd:boolean"/> </xsd:complexType> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel index 61f6a93e2f..b94aad8b0a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel @@ -250,7 +250,7 @@ <genClasses ecoreClass="eclipselink_orm.ecore#//XmlStructure"/> <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTable"/> <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTableGenerator"/> - <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantDiscriminator"/> + <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTenantDiscriminatorColumn"/> <genClasses ecoreClass="eclipselink_orm.ecore#//XmlTimeOfDay"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/hour"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//XmlTimeOfDay/minute"/> @@ -543,7 +543,7 @@ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntity_2_3/struct"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/tenantDiscriminators"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/tenantDiscriminatorColumns"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedStoredFunctionQueries"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredFunctionQueries"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlEntityMappings_2_3/namedPlsqlStoredProcedureQueries"/> @@ -563,12 +563,12 @@ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlNamedStoredFunctionQuery_2_3"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3/tenantDiscriminators"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlPersistenceUnitDefaults_2_3/tenantDiscriminatorColumns"/> </genClasses> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlRecord_2_3"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlPlsqlTable_2_3"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlStruct_2_3"/> - <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminator_2_3"/> + <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlTenantDiscriminatorColumn_2_3"/> <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3/structures"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_3/XmlAttributes_2_3/arrays"/> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore index 43c58233ef..b104fed2c6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore @@ -252,7 +252,7 @@ <eClassifiers xsi:type="ecore:EClass" name="XmlStructure" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//AbstractXmlAttributeMapping #//XmlAttributeMapping #//v2_3/XmlStructure_2_3"/> <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTable #//v2_2/XmlTable_2_2"/> <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlTableGenerator #//v2_2/XmlTableGenerator_2_2"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminator" eSuperTypes="#//v2_3/XmlTenantDiscriminator_2_3"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn" eSuperTypes="#//v2_3/XmlTenantDiscriminatorColumn_2_3"/> <eClassifiers xsi:type="ecore:EClass" name="XmlTimeOfDay"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="hour" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="minute" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> @@ -686,8 +686,8 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_3" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminators" - upperBound="-1" eType="#//v2_3/XmlTenantDiscriminator_2_3" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns" + upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries" upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries" @@ -724,16 +724,16 @@ interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_3" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminators" - upperBound="-1" eType="#//v2_3/XmlTenantDiscriminator_2_3" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns" + upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlRecord_2_3" abstract="true" interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlTable_2_3" abstract="true" interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="XmlStruct_2_3" abstract="true" interface="true"/> - <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminator_2_3" abstract="true" - interface="true"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlTenantDiscriminatorColumn_2_3" + abstract="true" interface="true"/> <eClassifiers xsi:type="ecore:EClass" name="XmlAttributes_2_3" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EReference" name="structures" upperBound="-1" diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java index e26eed3b78..67c8c7cfeb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java @@ -45,16 +45,13 @@ public class EclipseLinkOrmFactory extends EFactoryImpl */ public static EclipseLinkOrmFactory init() { - try - { + try { EclipseLinkOrmFactory theEclipseLinkOrmFactory = (EclipseLinkOrmFactory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.xmi"); - if (theEclipseLinkOrmFactory != null) - { + if (theEclipseLinkOrmFactory != null) { return theEclipseLinkOrmFactory; } } - catch (Exception exception) - { + catch (Exception exception) { EcorePlugin.INSTANCE.log(exception); } return new EclipseLinkOrmFactory(); @@ -79,8 +76,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl @Override public EObject create(EClass eClass) { - switch (eClass.getClassifierID()) - { + switch (eClass.getClassifierID()) { case EclipseLinkOrmPackage.XML_ACCESS_METHODS: return (EObject)createXmlAccessMethods(); case EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA: return (EObject)createXmlAdditionalCriteria(); case EclipseLinkOrmPackage.XML_ARRAY: return (EObject)createXmlArray(); @@ -144,7 +140,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl case EclipseLinkOrmPackage.XML_STRUCTURE: return (EObject)createXmlStructure(); case EclipseLinkOrmPackage.XML_TABLE: return (EObject)createXmlTable(); case EclipseLinkOrmPackage.XML_TABLE_GENERATOR: return (EObject)createXmlTableGenerator(); - case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR: return (EObject)createXmlTenantDiscriminator(); + case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN: return (EObject)createXmlTenantDiscriminatorColumn(); case EclipseLinkOrmPackage.XML_TIME_OF_DAY: return (EObject)createXmlTimeOfDay(); case EclipseLinkOrmPackage.XML_TRANSFORMATION: return (EObject)createXmlTransformation(); case EclipseLinkOrmPackage.XML_TRANSIENT: return (EObject)createXmlTransient(); @@ -166,8 +162,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl @Override public Object createFromString(EDataType eDataType, String initialValue) { - switch (eDataType.getClassifierID()) - { + switch (eDataType.getClassifierID()) { case EclipseLinkOrmPackage.CACHE_COORDINATION_TYPE: return createCacheCoordinationTypeFromString(eDataType, initialValue); case EclipseLinkOrmPackage.CACHE_TYPE: @@ -195,8 +190,7 @@ public class EclipseLinkOrmFactory extends EFactoryImpl @Override public String convertToString(EDataType eDataType, Object instanceValue) { - switch (eDataType.getClassifierID()) - { + switch (eDataType.getClassifierID()) { case EclipseLinkOrmPackage.CACHE_COORDINATION_TYPE: return convertCacheCoordinationTypeToString(eDataType, instanceValue); case EclipseLinkOrmPackage.CACHE_TYPE: @@ -826,10 +820,9 @@ public class EclipseLinkOrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public XmlTenantDiscriminator createXmlTenantDiscriminator() - { - XmlTenantDiscriminator xmlTenantDiscriminator = new XmlTenantDiscriminator(); - return xmlTenantDiscriminator; + public XmlTenantDiscriminatorColumn createXmlTenantDiscriminatorColumn() { + XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn = new XmlTenantDiscriminatorColumn(); + return xmlTenantDiscriminatorColumn; } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java index a18656bcd8..f5a628a815 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java @@ -2944,13 +2944,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_ENTITY_MAPPINGS__UNION_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 8; /** - * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list. + * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 9; + public static final int XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list. * <!-- begin-user-doc --> @@ -5668,13 +5668,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list. + * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 1; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Xml Persistence Unit Defaults</em>' class. * <!-- begin-user-doc --> @@ -6420,22 +6420,22 @@ public class EclipseLinkOrmPackage extends EPackageImpl */ public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = OrmPackage.XML_TABLE_GENERATOR_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator <em>Xml Tenant Discriminator</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn() * @generated */ - public static final int XML_TENANT_DISCRIMINATOR = 78; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN = 78; /** - * The number of structural features of the '<em>Xml Tenant Discriminator</em>' class. + * The number of structural features of the '<em>Xml Tenant Discriminator Column</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_TENANT_DISCRIMINATOR_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_23_FEATURE_COUNT + 0; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Hour</b></em>' attribute. * <!-- begin-user-doc --> @@ -7390,7 +7390,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlTenantDiscriminatorEClass = null; + private EClass xmlTenantDiscriminatorColumnEClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -9702,16 +9702,15 @@ public class EclipseLinkOrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator <em>Xml Tenant Discriminator</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Tenant Discriminator</em>'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator + * @return the meta object for class '<em>Xml Tenant Discriminator Column</em>'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn * @generated */ - public EClass getXmlTenantDiscriminator() - { - return xmlTenantDiscriminatorEClass; + public EClass getXmlTenantDiscriminatorColumn() { + return xmlTenantDiscriminatorColumnEClass; } /** @@ -10369,7 +10368,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlTableGeneratorEClass = createEClass(XML_TABLE_GENERATOR); - xmlTenantDiscriminatorEClass = createEClass(XML_TENANT_DISCRIMINATOR); + xmlTenantDiscriminatorColumnEClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN); xmlTimeOfDayEClass = createEClass(XML_TIME_OF_DAY); createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__HOUR); @@ -10594,7 +10593,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl xmlTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTable_2_2()); xmlTableGeneratorEClass.getESuperTypes().add(theOrmPackage.getXmlTableGenerator()); xmlTableGeneratorEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTableGenerator_2_2()); - xmlTenantDiscriminatorEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlTenantDiscriminator_2_3()); + xmlTenantDiscriminatorColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlTenantDiscriminatorColumn_2_3()); xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlTransformationEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlTransformation_2_1()); xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping()); @@ -10854,7 +10853,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl initEClass(xmlTableGeneratorEClass, XmlTableGenerator.class, "XmlTableGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(xmlTenantDiscriminatorEClass, XmlTenantDiscriminator.class, "XmlTenantDiscriminator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlTenantDiscriminatorColumnEClass, XmlTenantDiscriminatorColumn.class, "XmlTenantDiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlTimeOfDayEClass, XmlTimeOfDay.class, "XmlTimeOfDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlTimeOfDay_Hour(), theXMLTypePackage.getIntObject(), "hour", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -12313,14 +12312,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl public static final EClass XML_TABLE_GENERATOR = eINSTANCE.getXmlTableGenerator(); /** - * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator <em>Xml Tenant Discriminator</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn() * @generated */ - public static final EClass XML_TENANT_DISCRIMINATOR = eINSTANCE.getXmlTenantDiscriminator(); + public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN = eINSTANCE.getXmlTenantDiscriminatorColumn(); /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}' class. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java index 404c163daa..3ac76ec174 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java @@ -44,14 +44,14 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPart import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -168,14 +168,14 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml protected EList<XmlUnionPartitioning_2_2> unionPartitioning; /** - * The cached value of the '{@link #getTenantDiscriminators() <em>Tenant Discriminators</em>}' containment reference list. + * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTenantDiscriminators() + * @see #getTenantDiscriminatorColumns() * @generated * @ordered */ - protected EList<XmlTenantDiscriminator_2_3> tenantDiscriminators; + protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns; /** * The cached value of the '{@link #getNamedStoredFunctionQueries() <em>Named Stored Function Queries</em>}' containment reference list. @@ -326,8 +326,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml { XmlAccessMethods oldAccessMethods = accessMethods; accessMethods = newAccessMethods; - if (eNotificationRequired()) - { + if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS, oldAccessMethods, newAccessMethods); if (msgs == null) msgs = notification; else msgs.add(notification); } @@ -344,8 +343,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public void setAccessMethods(XmlAccessMethods newAccessMethods) { - if (newAccessMethods != accessMethods) - { + if (newAccessMethods != accessMethods) { NotificationChain msgs = null; if (accessMethods != null) msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS, null, msgs); @@ -374,8 +372,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlPartitioning_2_2> getPartitioning() { - if (partitioning == null) - { + if (partitioning == null) { partitioning = new EObjectContainmentEList<XmlPartitioning_2_2>(XmlPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING); } return partitioning; @@ -397,8 +394,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlReplicationPartitioning_2_2> getReplicationPartitioning() { - if (replicationPartitioning == null) - { + if (replicationPartitioning == null) { replicationPartitioning = new EObjectContainmentEList<XmlReplicationPartitioning_2_2>(XmlReplicationPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING); } return replicationPartitioning; @@ -420,8 +416,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlRoundRobinPartitioning_2_2> getRoundRobinPartitioning() { - if (roundRobinPartitioning == null) - { + if (roundRobinPartitioning == null) { roundRobinPartitioning = new EObjectContainmentEList<XmlRoundRobinPartitioning_2_2>(XmlRoundRobinPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING); } return roundRobinPartitioning; @@ -443,8 +438,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlPinnedPartitioning_2_2> getPinnedPartitioning() { - if (pinnedPartitioning == null) - { + if (pinnedPartitioning == null) { pinnedPartitioning = new EObjectContainmentEList<XmlPinnedPartitioning_2_2>(XmlPinnedPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING); } return pinnedPartitioning; @@ -466,8 +460,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlRangePartitioning_2_2> getRangePartitioning() { - if (rangePartitioning == null) - { + if (rangePartitioning == null) { rangePartitioning = new EObjectContainmentEList<XmlRangePartitioning_2_2>(XmlRangePartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING); } return rangePartitioning; @@ -489,8 +482,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlValuePartitioning_2_2> getValuePartitioning() { - if (valuePartitioning == null) - { + if (valuePartitioning == null) { valuePartitioning = new EObjectContainmentEList<XmlValuePartitioning_2_2>(XmlValuePartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING); } return valuePartitioning; @@ -512,8 +504,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlHashPartitioning_2_2> getHashPartitioning() { - if (hashPartitioning == null) - { + if (hashPartitioning == null) { hashPartitioning = new EObjectContainmentEList<XmlHashPartitioning_2_2>(XmlHashPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING); } return hashPartitioning; @@ -535,34 +526,31 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlUnionPartitioning_2_2> getUnionPartitioning() { - if (unionPartitioning == null) - { + if (unionPartitioning == null) { unionPartitioning = new EObjectContainmentEList<XmlUnionPartitioning_2_2>(XmlUnionPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING); } return unionPartitioning; } /** - * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}. + * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear, + * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Tenant Discriminators</em>' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminators() + * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminatorColumns() * @model containment="true" * @generated */ - public EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators() - { - if (tenantDiscriminators == null) - { - tenantDiscriminators = new EObjectContainmentEList<XmlTenantDiscriminator_2_3>(XmlTenantDiscriminator_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS); + public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns() { + if (tenantDiscriminatorColumns == null) { + tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS); } - return tenantDiscriminators; + return tenantDiscriminatorColumns; } /** @@ -581,8 +569,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries() { - if (namedStoredFunctionQueries == null) - { + if (namedStoredFunctionQueries == null) { namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES); } return namedStoredFunctionQueries; @@ -604,8 +591,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries() { - if (namedPlsqlStoredFunctionQueries == null) - { + if (namedPlsqlStoredFunctionQueries == null) { namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES); } return namedPlsqlStoredFunctionQueries; @@ -627,8 +613,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries() { - if (namedPlsqlStoredProcedureQueries == null) - { + if (namedPlsqlStoredProcedureQueries == null) { namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES); } return namedPlsqlStoredProcedureQueries; @@ -650,8 +635,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlPlsqlRecord_2_3> getPlsqlRecords() { - if (plsqlRecords == null) - { + if (plsqlRecords == null) { plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS); } return plsqlRecords; @@ -673,8 +657,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlPlsqlTable> getPlsqlTables() { - if (plsqlTables == null) - { + if (plsqlTables == null) { plsqlTables = new EObjectContainmentEList<XmlPlsqlTable>(XmlPlsqlTable.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES); } return plsqlTables; @@ -696,8 +679,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlConverter> getConverters() { - if (converters == null) - { + if (converters == null) { converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS); } return converters; @@ -719,8 +701,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlTypeConverter> getTypeConverters() { - if (typeConverters == null) - { + if (typeConverters == null) { typeConverters = new EObjectContainmentEList<XmlTypeConverter>(XmlTypeConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS); } return typeConverters; @@ -742,8 +723,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlObjectTypeConverter> getObjectTypeConverters() { - if (objectTypeConverters == null) - { + if (objectTypeConverters == null) { objectTypeConverters = new EObjectContainmentEList<XmlObjectTypeConverter>(XmlObjectTypeConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS); } return objectTypeConverters; @@ -765,8 +745,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlStructConverter> getStructConverters() { - if (structConverters == null) - { + if (structConverters == null) { structConverters = new EObjectContainmentEList<XmlStructConverter>(XmlStructConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS); } return structConverters; @@ -788,8 +767,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml */ public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries() { - if (namedStoredProcedureQueries == null) - { + if (namedStoredProcedureQueries == null) { namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES); } return namedStoredProcedureQueries; @@ -803,8 +781,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING: @@ -823,8 +800,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml return ((InternalEList<?>)getHashPartitioning()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING: return ((InternalEList<?>)getUnionPartitioning()).basicRemove(otherEnd, msgs); - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: - return ((InternalEList<?>)getTenantDiscriminators()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: + return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: return ((InternalEList<?>)getNamedStoredFunctionQueries()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: @@ -857,8 +834,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING: @@ -877,8 +853,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml return getHashPartitioning(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING: return getUnionPartitioning(); - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: - return getTenantDiscriminators(); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: + return getTenantDiscriminatorColumns(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: return getNamedStoredFunctionQueries(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: @@ -912,8 +888,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public void eSet(int featureID, Object newValue) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -949,9 +924,9 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml getUnionPartitioning().clear(); getUnionPartitioning().addAll((Collection<? extends XmlUnionPartitioning_2_2>)newValue); return; - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: - getTenantDiscriminators().clear(); - getTenantDiscriminators().addAll((Collection<? extends XmlTenantDiscriminator_2_3>)newValue); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: + getTenantDiscriminatorColumns().clear(); + getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue); return; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: getNamedStoredFunctionQueries().clear(); @@ -1005,8 +980,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public void eUnset(int featureID) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -1034,8 +1008,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING: getUnionPartitioning().clear(); return; - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: - getTenantDiscriminators().clear(); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: + getTenantDiscriminatorColumns().clear(); return; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: getNamedStoredFunctionQueries().clear(); @@ -1079,8 +1053,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public boolean eIsSet(int featureID) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING: @@ -1099,8 +1072,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml return hashPartitioning != null && !hashPartitioning.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING: return unionPartitioning != null && !unionPartitioning.isEmpty(); - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: - return tenantDiscriminators != null && !tenantDiscriminators.isEmpty(); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: + return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: return namedStoredFunctionQueries != null && !namedStoredFunctionQueries.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: @@ -1133,25 +1106,19 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) - { - switch (derivedFeatureID) - { + if (baseClass == XmlAccessMethodsHolder.class) { + switch (derivedFeatureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlEntityMappings_2_1.class) - { - switch (derivedFeatureID) - { + if (baseClass == XmlEntityMappings_2_1.class) { + switch (derivedFeatureID) { default: return -1; } } - if (baseClass == XmlEntityMappings_2_2.class) - { - switch (derivedFeatureID) - { + if (baseClass == XmlEntityMappings_2_2.class) { + switch (derivedFeatureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__PARTITIONING; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING; @@ -1163,11 +1130,9 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml default: return -1; } } - if (baseClass == XmlEntityMappings_2_3.class) - { - switch (derivedFeatureID) - { - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS; + if (baseClass == XmlEntityMappings_2_3.class) { + switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES; @@ -1176,10 +1141,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml default: return -1; } } - if (baseClass == XmlConvertersHolder.class) - { - switch (derivedFeatureID) - { + if (baseClass == XmlConvertersHolder.class) { + switch (derivedFeatureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS; @@ -1187,10 +1150,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml default: return -1; } } - if (baseClass == XmlQueryContainer.class) - { - switch (derivedFeatureID) - { + if (baseClass == XmlQueryContainer.class) { + switch (derivedFeatureID) { case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES; default: return -1; } @@ -1206,25 +1167,19 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) - { - switch (baseFeatureID) - { + if (baseClass == XmlAccessMethodsHolder.class) { + switch (baseFeatureID) { case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS; default: return -1; } } - if (baseClass == XmlEntityMappings_2_1.class) - { - switch (baseFeatureID) - { + if (baseClass == XmlEntityMappings_2_1.class) { + switch (baseFeatureID) { default: return -1; } } - if (baseClass == XmlEntityMappings_2_2.class) - { - switch (baseFeatureID) - { + if (baseClass == XmlEntityMappings_2_2.class) { + switch (baseFeatureID) { case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING; case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING; case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING; @@ -1236,11 +1191,9 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml default: return -1; } } - if (baseClass == XmlEntityMappings_2_3.class) - { - switch (baseFeatureID) - { - case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS; + if (baseClass == XmlEntityMappings_2_3.class) { + switch (baseFeatureID) { + case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS; case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES; case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES; case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES; @@ -1249,10 +1202,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml default: return -1; } } - if (baseClass == XmlConvertersHolder.class) - { - switch (baseFeatureID) - { + if (baseClass == XmlConvertersHolder.class) { + switch (baseFeatureID) { case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS; case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS; case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS; @@ -1260,10 +1211,8 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml default: return -1; } } - if (baseClass == XmlQueryContainer.class) - { - switch (baseFeatureID) - { + if (baseClass == XmlQueryContainer.class) { + switch (baseFeatureID) { case EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES; default: return -1; } @@ -1329,7 +1278,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml buildCatalogTranslator(), buildAccessTranslator(), buildAccessMethodsTranslator(), - XmlTenantDiscriminator.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminators()), + XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminatorColumns()), 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()), diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java index 238c15a4bd..f84f614de0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java @@ -12,14 +12,11 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; 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.common.core.internal.utility.translators.SimpleTranslator; @@ -27,7 +24,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnit import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -62,14 +59,14 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc protected XmlAccessMethods accessMethods; /** - * The cached value of the '{@link #getTenantDiscriminators() <em>Tenant Discriminators</em>}' containment reference list. + * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getTenantDiscriminators() + * @see #getTenantDiscriminatorColumns() * @generated * @ordered */ - protected EList<XmlTenantDiscriminator_2_3> tenantDiscriminators; + protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns; /** * <!-- begin-user-doc --> @@ -120,8 +117,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc { XmlAccessMethods oldAccessMethods = accessMethods; accessMethods = newAccessMethods; - if (eNotificationRequired()) - { + 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); } @@ -138,8 +134,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc */ public void setAccessMethods(XmlAccessMethods newAccessMethods) { - if (newAccessMethods != accessMethods) - { + 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); @@ -153,26 +148,24 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc } /** - * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}. + * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear, + * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Tenant Discriminators</em>' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators() + * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns() * @model containment="true" * @generated */ - public EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators() - { - if (tenantDiscriminators == null) - { - tenantDiscriminators = new EObjectContainmentEList<XmlTenantDiscriminator_2_3>(XmlTenantDiscriminator_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS); + public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns() { + if (tenantDiscriminatorColumns == null) { + tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS); } - return tenantDiscriminators; + return tenantDiscriminatorColumns; } /** @@ -183,12 +176,11 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: - return ((InternalEList<?>)getTenantDiscriminators()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: + return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -201,12 +193,11 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: return getAccessMethods(); - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: - return getTenantDiscriminators(); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: + return getTenantDiscriminatorColumns(); } return super.eGet(featureID, resolve, coreType); } @@ -220,14 +211,13 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public void eSet(int featureID, Object newValue) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: - getTenantDiscriminators().clear(); - getTenantDiscriminators().addAll((Collection<? extends XmlTenantDiscriminator_2_3>)newValue); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: + getTenantDiscriminatorColumns().clear(); + getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue); return; } super.eSet(featureID, newValue); @@ -241,13 +231,12 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public void eUnset(int featureID) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: - getTenantDiscriminators().clear(); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: + getTenantDiscriminatorColumns().clear(); return; } super.eUnset(featureID); @@ -261,12 +250,11 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public boolean eIsSet(int featureID) { - switch (featureID) - { + switch (featureID) { case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: return accessMethods != null; - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: - return tenantDiscriminators != null && !tenantDiscriminators.isEmpty(); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: + return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty(); } return super.eIsSet(featureID); } @@ -279,26 +267,20 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) - { - switch (derivedFeatureID) - { + 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) - { + if (baseClass == XmlPersistenceUnitDefaults_2_1.class) { + switch (derivedFeatureID) { default: return -1; } } - if (baseClass == XmlPersistenceUnitDefaults_2_3.class) - { - switch (derivedFeatureID) - { - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS; + if (baseClass == XmlPersistenceUnitDefaults_2_3.class) { + switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS; default: return -1; } } @@ -313,26 +295,20 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { - if (baseClass == XmlAccessMethodsHolder.class) - { - switch (baseFeatureID) - { + 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) - { + if (baseClass == XmlPersistenceUnitDefaults_2_1.class) { + switch (baseFeatureID) { default: return -1; } } - if (baseClass == XmlPersistenceUnitDefaults_2_3.class) - { - switch (baseFeatureID) - { - case EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS; + if (baseClass == XmlPersistenceUnitDefaults_2_3.class) { + switch (baseFeatureID) { + case EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS; default: return -1; } } @@ -355,7 +331,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc buildAccessTranslator(), buildAccessMethodsTranslator(), buildCascadePersistTranslator(), - XmlTenantDiscriminator.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators()), + XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()), buildEntityListenersTranslator() }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java index a7b6f17a85..eaf6b27d11 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java @@ -11,11 +11,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -24,18 +22,18 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn() * @model kind="class" * @generated */ -public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTenantDiscriminator_2_3 +public class XmlTenantDiscriminatorColumn extends AbstractJpaEObject implements XmlTenantDiscriminatorColumn_2_3 { /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected XmlTenantDiscriminator() + protected XmlTenantDiscriminatorColumn() { super(); } @@ -48,15 +46,17 @@ public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTen @Override protected EClass eStaticClass() { - return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR; + return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR_COLUMN; } + + // ********** translators ********** public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { return new SimpleTranslator( elementName, structuralFeature, - EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminator(), + EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminatorColumn(), buildTranslatorChildren()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java index de631aafed..0508f7eda3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java @@ -26,7 +26,7 @@ public interface EclipseLink2_3 String COMPOSITE_MEMBER = "composite-member"; String MULTITENANT = "multitenant"; - String TENANT_DISCRIMINATOR = "tenant-discriminator"; + String TENANT_DISCRIMINATOR_COLUMN = "tenant-discriminator-column"; String MULTITENANT__TYPE = "type"; String MULTITENANT_TYPE = "multiltenant-type"; String NAMED_STORED_FUNCTION_QUERY = "named-stored-function-query"; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java index 5fd78bfe70..9cff0bf9a5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java @@ -239,13 +239,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final int XML_ENTITY_MAPPINGS_23 = 2; /** - * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list. + * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS = 0; + public static final int XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS = 0; /** * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list. @@ -441,13 +441,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23 = 8; /** - * The feature id for the '<em><b>Tenant Discriminators</b></em>' containment reference list. + * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS = 0; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS = 0; /** * The number of structural features of the '<em>Xml Persistence Unit Defaults 23</em>' class. @@ -516,23 +516,23 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final int XML_STRUCT_23_FEATURE_COUNT = 0; /** - * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 <em>Xml Tenant Discriminator 23</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3() * @generated */ - public static final int XML_TENANT_DISCRIMINATOR_23 = 12; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23 = 12; /** - * The number of structural features of the '<em>Xml Tenant Discriminator 23</em>' class. + * The number of structural features of the '<em>Xml Tenant Discriminator Column 23</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int XML_TENANT_DISCRIMINATOR_23_FEATURE_COUNT = 0; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23_FEATURE_COUNT = 0; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}' class. @@ -726,7 +726,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlTenantDiscriminator_2_3EClass = null; + private EClass xmlTenantDiscriminatorColumn_2_3EClass = null; /** * <!-- begin-user-doc --> @@ -1190,16 +1190,15 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Tenant Discriminators</em>'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators() + * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns() * @see #getXmlEntityMappings_2_3() * @generated */ - public EReference getXmlEntityMappings_2_3_TenantDiscriminators() - { + public EReference getXmlEntityMappings_2_3_TenantDiscriminatorColumns() { return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(0); } @@ -1294,16 +1293,15 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Tenant Discriminators</em>'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators() + * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns() * @see #getXmlPersistenceUnitDefaults_2_3() * @generated */ - public EReference getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators() - { + public EReference getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns() { return (EReference)xmlPersistenceUnitDefaults_2_3EClass.getEStructuralFeatures().get(0); } @@ -1351,16 +1349,15 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 <em>Xml Tenant Discriminator 23</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Tenant Discriminator 23</em>'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 + * @return the meta object for class '<em>Xml Tenant Discriminator Column 23</em>'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 * @generated */ - public EClass getXmlTenantDiscriminator_2_3() - { - return xmlTenantDiscriminator_2_3EClass; + public EClass getXmlTenantDiscriminatorColumn_2_3() { + return xmlTenantDiscriminatorColumn_2_3EClass; } @@ -1512,7 +1509,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__STRUCT); xmlEntityMappings_2_3EClass = createEClass(XML_ENTITY_MAPPINGS_23); - createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS); + createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS); createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES); createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES); createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES); @@ -1536,7 +1533,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl xmlNamedStoredFunctionQuery_2_3EClass = createEClass(XML_NAMED_STORED_FUNCTION_QUERY_23); xmlPersistenceUnitDefaults_2_3EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_23); - createEReference(xmlPersistenceUnitDefaults_2_3EClass, XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS); + createEReference(xmlPersistenceUnitDefaults_2_3EClass, XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS); xmlPlsqlRecord_2_3EClass = createEClass(XML_PLSQL_RECORD_23); @@ -1544,7 +1541,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl xmlStruct_2_3EClass = createEClass(XML_STRUCT_23); - xmlTenantDiscriminator_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_23); + xmlTenantDiscriminatorColumn_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN_23); xmlAttributes_2_3EClass = createEClass(XML_ATTRIBUTES_23); createEReference(xmlAttributes_2_3EClass, XML_ATTRIBUTES_23__STRUCTURES); @@ -1608,7 +1605,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl initEReference(getXmlEntity_2_3_Struct(), this.getXmlStruct_2_3(), null, "struct", null, 0, 1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlEntityMappings_2_3EClass, XmlEntityMappings_2_3.class, "XmlEntityMappings_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlEntityMappings_2_3_TenantDiscriminators(), this.getXmlTenantDiscriminator_2_3(), null, "tenantDiscriminators", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlEntityMappings_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlEntityMappings_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1632,7 +1629,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl initEClass(xmlNamedStoredFunctionQuery_2_3EClass, XmlNamedStoredFunctionQuery_2_3.class, "XmlNamedStoredFunctionQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlPersistenceUnitDefaults_2_3EClass, XmlPersistenceUnitDefaults_2_3.class, "XmlPersistenceUnitDefaults_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators(), this.getXmlTenantDiscriminator_2_3(), null, "tenantDiscriminators", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlPlsqlRecord_2_3EClass, XmlPlsqlRecord_2_3.class, "XmlPlsqlRecord_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1640,7 +1637,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl initEClass(xmlStruct_2_3EClass, XmlStruct_2_3.class, "XmlStruct_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(xmlTenantDiscriminator_2_3EClass, XmlTenantDiscriminator_2_3.class, "XmlTenantDiscriminator_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlTenantDiscriminatorColumn_2_3EClass, XmlTenantDiscriminatorColumn_2_3.class, "XmlTenantDiscriminatorColumn_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlAttributes_2_3EClass, XmlAttributes_2_3.class, "XmlAttributes_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlAttributes_2_3_Structures(), this.getXmlStructure_2_3(), null, "structures", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1877,12 +1874,12 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final EClass XML_ENTITY_MAPPINGS_23 = eINSTANCE.getXmlEntityMappings_2_3(); /** - * The meta object literal for the '<em><b>Tenant Discriminators</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public static final EReference XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS = eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminators(); + public static final EReference XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminatorColumns(); /** * The meta object literal for the '<em><b>Named Stored Function Queries</b></em>' containment reference list feature. @@ -1935,12 +1932,12 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS_23 = eINSTANCE.getXmlPersistenceUnitDefaults_2_3(); /** - * The meta object literal for the '<em><b>Tenant Discriminators</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - public static final EReference XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS = eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators(); + public static final EReference XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(); /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3 <em>Xml Plsql Record 23</em>}' class. @@ -1973,14 +1970,14 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final EClass XML_STRUCT_23 = eINSTANCE.getXmlStruct_2_3(); /** - * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 <em>Xml Tenant Discriminator 23</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3() * @generated */ - public static final EClass XML_TENANT_DISCRIMINATOR_23 = eINSTANCE.getXmlTenantDiscriminator_2_3(); + public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN_23 = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3(); /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}' class. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java index fed46df041..9c1ddf28bd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}</li> + * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li> * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}</li> * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}</li> * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}</li> @@ -39,20 +39,20 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable; public interface XmlEntityMappings_2_3 extends JpaEObject { /** - * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}. + * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear, + * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Tenant Discriminators</em>' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_TenantDiscriminators() + * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_TenantDiscriminatorColumns() * @model containment="true" * @generated */ - EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators(); + EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns(); /** * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java index d6ad213ec5..e63726e7f6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators <em>Tenant Discriminators</em>}</li> + * <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li> * </ul> * </p> * @@ -33,19 +33,19 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; public interface XmlPersistenceUnitDefaults_2_3 extends JpaEObject { /** - * Returns the value of the '<em><b>Tenant Discriminators</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3}. + * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Tenant Discriminators</em>' containment reference list isn't clear, + * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Tenant Discriminators</em>' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators() + * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns() * @model containment="true" * @generated */ - EList<XmlTenantDiscriminator_2_3> getTenantDiscriminators(); + EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns(); } // XmlPersistenceUnitDefaults_2_3 diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java index 7fbca8466f..e956f030bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java @@ -17,11 +17,11 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3() * @model kind="class" interface="true" abstract="true" * @extends JpaEObject * @generated */ -public interface XmlTenantDiscriminator_2_3 extends JpaEObject +public interface XmlTenantDiscriminatorColumn_2_3 extends JpaEObject { -} // XmlTenantDiscriminator2_3 +} // XmlTenantDiscriminatorColumn_2_3 |