From 0c35e363a14cad5bbe29dc6ca599476ad7e323a8 Mon Sep 17 00:00:00 2001 From: kmoore Date: Mon, 25 Jul 2011 11:59:37 +0000 Subject: updated eclipselink-orm schema for tenant-discriminator-column mistake - bug 352676 --- .../schemas/eclipselink_orm_2_3.xsd | 24 +-- .../model/eclipseLinkResourceModels.genmodel | 10 +- .../model/eclipselink_orm.ecore | 14 +- .../core/resource/orm/EclipseLinkOrmFactory.java | 8 +- .../core/resource/orm/EclipseLinkOrmPackage.java | 48 ++--- .../core/resource/orm/XmlEntityMappings.java | 54 +++--- .../resource/orm/XmlPersistenceUnitDefaults.java | 54 +++--- .../core/resource/orm/XmlTenantDiscriminator.java | 213 --------------------- .../resource/orm/XmlTenantDiscriminatorColumn.java | 213 +++++++++++++++++++++ .../core/resource/orm/v2_3/EclipseLink2_3.java | 4 +- .../orm/v2_3/EclipseLinkOrmV2_3Package.java | 106 +++++----- .../resource/orm/v2_3/XmlEntityMappings_2_3.java | 14 +- .../orm/v2_3/XmlPersistenceUnitDefaults_2_3.java | 14 +- .../orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java | 59 ++++++ .../orm/v2_3/XmlTenantDiscriminator_2_3.java | 59 ------ 15 files changed, 445 insertions(+), 449 deletions(-) delete mode 100644 jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java create mode 100644 jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java create mode 100644 jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java delete mode 100644 jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java 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"/> - @@ -818,7 +818,7 @@ minOccurs="0"/> - @@ -2217,8 +2217,6 @@ - - @@ -3312,7 +3310,7 @@ - + @@ -5003,23 +5001,22 @@ - + - @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; } - - + - + 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 02a5d7593a..08fb91cb63 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 @@ - + @@ -552,7 +552,7 @@ - + @@ -580,7 +580,7 @@ - + @@ -591,8 +591,8 @@ - - + + 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 90d146e90e..7dbaa6d7bb 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 @@ - + @@ -694,8 +694,8 @@ - + - + @@ -754,8 +754,8 @@ - + * @generated */ - public XmlTenantDiscriminator createXmlTenantDiscriminator() + public XmlTenantDiscriminatorColumn createXmlTenantDiscriminatorColumn() { - XmlTenantDiscriminator xmlTenantDiscriminator = new XmlTenantDiscriminator(); - return xmlTenantDiscriminator; + 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 3b43ee9aa5..e992ccc54e 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 'Tenant Discriminators' containment reference list. + * The feature id for the 'Tenant Discriminator Columns' containment reference list. * * * @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 'Named Stored Function Queries' containment reference list. * @@ -5700,13 +5700,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 'Tenant Discriminators' containment reference list. + * The feature id for the 'Tenant Discriminator Columns' containment reference list. * * * @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 'Xml Persistence Unit Defaults' class. * @@ -6476,14 +6476,14 @@ 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 Xml Tenant Discriminator}' class. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn Xml Tenant Discriminator Column}' class. * * - * @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 feature id for the 'Name' attribute. * @@ -6491,15 +6491,15 @@ public class EclipseLinkOrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_TENANT_DISCRIMINATOR__NAME = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_23__NAME; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN__NAME = EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME; /** - * The number of structural features of the 'Xml Tenant Discriminator' class. + * The number of structural features of the 'Xml Tenant Discriminator Column' class. * * * @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 'Hour' attribute. * @@ -7454,7 +7454,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl * * @generated */ - private EClass xmlTenantDiscriminatorEClass = null; + private EClass xmlTenantDiscriminatorColumnEClass = null; /** * * @@ -9766,16 +9766,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator Xml Tenant Discriminator}'. + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn Xml Tenant Discriminator Column}'. * * - * @return the meta object for class 'Xml Tenant Discriminator'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator + * @return the meta object for class 'Xml Tenant Discriminator Column'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn * @generated */ - public EClass getXmlTenantDiscriminator() + public EClass getXmlTenantDiscriminatorColumn() { - return xmlTenantDiscriminatorEClass; + return xmlTenantDiscriminatorColumnEClass; } /** @@ -10433,7 +10433,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); @@ -10658,7 +10658,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()); @@ -10918,7 +10918,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); @@ -12377,14 +12377,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 Xml Tenant Discriminator}' class. + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn Xml Tenant Discriminator Column}' class. * * - * @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 Xml Time Of Day}' 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..db82fc24cc 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 @@ -50,7 +50,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStore 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.XmlTenantDiscriminatorColumn_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_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 unionPartitioning; /** - * The cached value of the '{@link #getTenantDiscriminators() Tenant Discriminators}' containment reference list. + * The cached value of the '{@link #getTenantDiscriminatorColumns() Tenant Discriminator Columns}' containment reference list. * * - * @see #getTenantDiscriminators() + * @see #getTenantDiscriminatorColumns() * @generated * @ordered */ - protected EList tenantDiscriminators; + protected EList tenantDiscriminatorColumns; /** * The cached value of the '{@link #getNamedStoredFunctionQueries() Named Stored Function Queries}' containment reference list. @@ -543,26 +543,26 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml } /** - * Returns the value of the 'Tenant Discriminators' 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 'Tenant Discriminator Columns' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * *

- * If the meaning of the 'Tenant Discriminators' containment reference list isn't clear, + * If the meaning of the 'Tenant Discriminator Columns' containment reference list isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Tenant Discriminators' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminators() + * @return the value of the 'Tenant Discriminator Columns' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminatorColumns() * @model containment="true" * @generated */ - public EList getTenantDiscriminators() + public EList getTenantDiscriminatorColumns() { - if (tenantDiscriminators == null) + if (tenantDiscriminatorColumns == null) { - tenantDiscriminators = new EObjectContainmentEList(XmlTenantDiscriminator_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS); + tenantDiscriminatorColumns = new EObjectContainmentEList(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS); } - return tenantDiscriminators; + return tenantDiscriminatorColumns; } /** @@ -823,8 +823,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: @@ -877,8 +877,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: @@ -949,9 +949,9 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml getUnionPartitioning().clear(); getUnionPartitioning().addAll((Collection)newValue); return; - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: - getTenantDiscriminators().clear(); - getTenantDiscriminators().addAll((Collection)newValue); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: + getTenantDiscriminatorColumns().clear(); + getTenantDiscriminatorColumns().addAll((Collection)newValue); return; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: getNamedStoredFunctionQueries().clear(); @@ -1034,8 +1034,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(); @@ -1099,8 +1099,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: @@ -1167,7 +1167,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS; + 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; @@ -1240,7 +1240,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml { switch (baseFeatureID) { - case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATORS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATORS; + 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; @@ -1329,7 +1329,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..9588a15cca 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 @@ -27,7 +27,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 +62,14 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc protected XmlAccessMethods accessMethods; /** - * The cached value of the '{@link #getTenantDiscriminators() Tenant Discriminators}' containment reference list. + * The cached value of the '{@link #getTenantDiscriminatorColumns() Tenant Discriminator Columns}' containment reference list. * * - * @see #getTenantDiscriminators() + * @see #getTenantDiscriminatorColumns() * @generated * @ordered */ - protected EList tenantDiscriminators; + protected EList tenantDiscriminatorColumns; /** * @@ -153,26 +153,26 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc } /** - * Returns the value of the 'Tenant Discriminators' 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 'Tenant Discriminator Columns' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * *

- * If the meaning of the 'Tenant Discriminators' containment reference list isn't clear, + * If the meaning of the 'Tenant Discriminator Columns' containment reference list isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Tenant Discriminators' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminators() + * @return the value of the 'Tenant Discriminator Columns' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns() * @model containment="true" * @generated */ - public EList getTenantDiscriminators() + public EList getTenantDiscriminatorColumns() { - if (tenantDiscriminators == null) + if (tenantDiscriminatorColumns == null) { - tenantDiscriminators = new EObjectContainmentEList(XmlTenantDiscriminator_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS); + tenantDiscriminatorColumns = new EObjectContainmentEList(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS); } - return tenantDiscriminators; + return tenantDiscriminatorColumns; } /** @@ -187,8 +187,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc { 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); } @@ -205,8 +205,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc { 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); } @@ -225,9 +225,9 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc 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)newValue); + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: + getTenantDiscriminatorColumns().clear(); + getTenantDiscriminatorColumns().addAll((Collection)newValue); return; } super.eSet(featureID, newValue); @@ -246,8 +246,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc 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); @@ -265,8 +265,8 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc { 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); } @@ -298,7 +298,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS; + case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS; default: return -1; } } @@ -332,7 +332,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc { switch (baseFeatureID) { - case EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATORS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATORS; + 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 +355,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/XmlTenantDiscriminator.java deleted file mode 100644 index b4d6ccdd55..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminator.java +++ /dev/null @@ -1,213 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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.jpa.eclipselink.core.resource.orm; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -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.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.XmlTenantDiscriminator_2_3; -import org.eclipse.wst.common.internal.emf.resource.Translator; - -/** - * - * A representation of the model object 'Xml Tenant Discriminator'. - * - * - * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator() - * @model kind="class" - * @generated - */ -public class XmlTenantDiscriminator extends AbstractJpaEObject implements XmlTenantDiscriminator_2_3 -{ - /** - * The default value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - /** - * The cached value of the '{@link #getName() Name}' attribute. - * - * - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * - * - * @generated - */ - protected XmlTenantDiscriminator() - { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR; - } - /** - * Returns the value of the 'Name' attribute. - * - *

- * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminator_2_3_Name() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * @generated - */ - public String getName() - { - return name; - } - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminator#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - public void setName(String newName) - { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME, oldName, name)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME: - return getName(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME: - setName((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME: - setName(NAME_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (name: "); - result.append(name); - result.append(')'); - return result.toString(); - } - - // ********** translators ********** - - public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { - return new SimpleTranslator( - elementName, - structuralFeature, - EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminator(), - buildTranslatorChildren()); - } - - private static Translator[] buildTranslatorChildren() { - return new Translator[] { - buildNameTranslator(), - }; - } - - protected static Translator buildNameTranslator() { - return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminator_2_3_Name(), Translator.DOM_ATTRIBUTE); - } -} // XmlTenantDiscriminator diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java new file mode 100644 index 0000000000..56bf34a6c6 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java @@ -0,0 +1,213 @@ +/******************************************************************************* + * Copyright (c) 2011 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.jpa.eclipselink.core.resource.orm; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +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.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.XmlTenantDiscriminatorColumn_2_3; +import org.eclipse.wst.common.internal.emf.resource.Translator; + +/** + * + * A representation of the model object 'Xml Tenant Discriminator'. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn() + * @model kind="class" + * @generated + */ +public class XmlTenantDiscriminatorColumn extends AbstractJpaEObject implements XmlTenantDiscriminatorColumn_2_3 +{ + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * + * + * @generated + */ + protected XmlTenantDiscriminatorColumn() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR_COLUMN; + } + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn_2_3_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getName() + { + return name; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + public void setName(String newName) + { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME: + return getName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME: + setName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME: + setName(NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(')'); + return result.toString(); + } + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminatorColumn(), + buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildNameTranslator(), + }; + } + + protected static Translator buildNameTranslator() { + return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_Name(), Translator.DOM_ATTRIBUTE); + } +} // XmlTenantDiscriminator 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 7202ec9323..9a373a47e7 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 @@ -41,8 +41,8 @@ public interface EclipseLink2_3 String STRUCT = "struct"; String STRUCT__NAME = "name"; String STRUCTURE = "structure"; - String TENANT_DISCRIMINATOR = "tenant-discriminator"; - String TENANT_DISCRIMINATOR__NAME = "name"; + String TENANT_DISCRIMINATOR_COLUMN = "tenant-discriminator-column"; + String TENANT_DISCRIMINATOR_COLUMN__NAME = "name"; } \ No newline at end of file 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 fdf591e3d8..9eff76397d 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 @@ -201,16 +201,6 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ public static final int XML_STRUCT_23 = 13; - /** - * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 Xml Tenant Discriminator 23}' class. - * - * - * @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() - * @generated - */ - public static final int XML_TENANT_DISCRIMINATOR_23 = 14; - /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 Xml Attributes 23}' class. * @@ -386,13 +376,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final int XML_ENTITY_23_FEATURE_COUNT = 7; /** - * The feature id for the 'Tenant Discriminators' containment reference list. + * The feature id for the 'Tenant Discriminator Columns' containment reference list. * * * @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 'Named Stored Function Queries' containment reference list. @@ -584,13 +574,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final int XML_NAMED_STORED_FUNCTION_QUERY_23_FEATURE_COUNT = 1; /** - * The feature id for the 'Tenant Discriminators' containment reference list. + * The feature id for the 'Tenant Discriminator Columns' containment reference list. * * * @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 'Xml Persistence Unit Defaults 23' class. @@ -655,6 +645,16 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ public static final int XML_STRUCT_23_FEATURE_COUNT = 1; + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 Xml Tenant Discriminator Column 23}' class. + * + * + * @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_COLUMN_23 = 14; + /** * The feature id for the 'Name' attribute. * @@ -662,16 +662,16 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_TENANT_DISCRIMINATOR_23__NAME = 0; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME = 0; /** - * The number of structural features of the 'Xml Tenant Discriminator 23' class. + * The number of structural features of the 'Xml Tenant Discriminator Column 23' class. * * * @generated * @ordered */ - public static final int XML_TENANT_DISCRIMINATOR_23_FEATURE_COUNT = 1; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23_FEATURE_COUNT = 1; /** * The number of structural features of the 'Xml Structure 23' class. @@ -809,7 +809,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * * @generated */ - private EClass xmlTenantDiscriminator_2_3EClass = null; + private EClass xmlTenantDiscriminatorColumn_2_3EClass = null; /** * @@ -1340,15 +1340,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 Tenant Discriminators}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns Tenant Discriminator Columns}'. * * - * @return the meta object for the containment reference list 'Tenant Discriminators'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators() + * @return the meta object for the containment reference list 'Tenant Discriminator Columns'. + * @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); } @@ -1444,15 +1444,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 Tenant Discriminators}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns Tenant Discriminator Columns}'. * * - * @return the meta object for the containment reference list 'Tenant Discriminators'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators() + * @return the meta object for the containment reference list 'Tenant Discriminator Columns'. + * @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); } @@ -1546,31 +1546,31 @@ 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 Xml Tenant Discriminator 23}'. + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 Xml Tenant Discriminator Column 23}'. * * - * @return the meta object for class 'Xml Tenant Discriminator 23'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 + * @return the meta object for class 'Xml Tenant Discriminator Column 23'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 * @generated */ - public EClass getXmlTenantDiscriminator_2_3() + public EClass getXmlTenantDiscriminatorColumn_2_3() { - return xmlTenantDiscriminator_2_3EClass; + return xmlTenantDiscriminatorColumn_2_3EClass; } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName Name}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName Name}'. * * * @return the meta object for the attribute 'Name'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName() - * @see #getXmlTenantDiscriminator_2_3() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName() + * @see #getXmlTenantDiscriminatorColumn_2_3() * @generated */ - public EAttribute getXmlTenantDiscriminator_2_3_Name() + public EAttribute getXmlTenantDiscriminatorColumn_2_3_Name() { - return (EAttribute)xmlTenantDiscriminator_2_3EClass.getEStructuralFeatures().get(0); + return (EAttribute)xmlTenantDiscriminatorColumn_2_3EClass.getEStructuralFeatures().get(0); } @@ -1742,7 +1742,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); @@ -1770,7 +1770,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl createEAttribute(xmlNamedStoredFunctionQuery_2_3EClass, XML_NAMED_STORED_FUNCTION_QUERY_23__NAME); 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); createEAttribute(xmlPlsqlRecord_2_3EClass, XML_PLSQL_RECORD_23__NAME); @@ -1781,8 +1781,8 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl xmlStruct_2_3EClass = createEClass(XML_STRUCT_23); createEAttribute(xmlStruct_2_3EClass, XML_STRUCT_23__NAME); - xmlTenantDiscriminator_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_23); - createEAttribute(xmlTenantDiscriminator_2_3EClass, XML_TENANT_DISCRIMINATOR_23__NAME); + xmlTenantDiscriminatorColumn_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN_23); + createEAttribute(xmlTenantDiscriminatorColumn_2_3EClass, XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME); xmlStructure_2_3EClass = createEClass(XML_STRUCTURE_23); @@ -1849,7 +1849,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); @@ -1877,7 +1877,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl initEAttribute(getXmlNamedStoredFunctionQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedStoredFunctionQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 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); initEAttribute(getXmlPlsqlRecord_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPlsqlRecord_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1888,8 +1888,8 @@ 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); initEAttribute(getXmlStruct_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStruct_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlTenantDiscriminator_2_3EClass, XmlTenantDiscriminator_2_3.class, "XmlTenantDiscriminator_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlTenantDiscriminator_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlTenantDiscriminator_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlTenantDiscriminatorColumn_2_3EClass, XmlTenantDiscriminatorColumn_2_3.class, "XmlTenantDiscriminatorColumn_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlTenantDiscriminatorColumn_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlTenantDiscriminatorColumn_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlStructure_2_3EClass, XmlStructure_2_3.class, "XmlStructure_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -2157,12 +2157,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 'Tenant Discriminators' containment reference list feature. + * The meta object literal for the 'Tenant Discriminator Columns' containment reference list feature. * * * @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 'Named Stored Function Queries' containment reference list feature. @@ -2215,12 +2215,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 'Tenant Discriminators' containment reference list feature. + * The meta object literal for the 'Tenant Discriminator Columns' containment reference list feature. * * * @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 Xml Plsql Record 23}' class. @@ -2277,14 +2277,14 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl public static final EAttribute XML_STRUCT_23__NAME = eINSTANCE.getXmlStruct_2_3_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3 Xml Tenant Discriminator 23}' class. + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 Xml Tenant Discriminator Column 23}' class. * * - * @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 'Name' attribute feature. @@ -2292,7 +2292,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * * @generated */ - public static final EAttribute XML_TENANT_DISCRIMINATOR_23__NAME = eINSTANCE.getXmlTenantDiscriminator_2_3_Name(); + public static final EAttribute XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_Name(); /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 Xml Attributes 23}' 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; *

* The following features are supported: *

    - *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminators Tenant Discriminators}
    • + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns Tenant Discriminator Columns}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedStoredFunctionQueries Named Stored Function Queries}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredFunctionQueries Named Plsql Stored Function Queries}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredProcedureQueries Named Plsql Stored Procedure Queries}
    • @@ -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 'Tenant Discriminators' 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 'Tenant Discriminator Columns' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * *

    - * If the meaning of the 'Tenant Discriminators' containment reference list isn't clear, + * If the meaning of the 'Tenant Discriminator Columns' containment reference list isn't clear, * there really should be more of a description here... *

    * - * @return the value of the 'Tenant Discriminators' 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 'Tenant Discriminator Columns' 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 getTenantDiscriminators(); + EList getTenantDiscriminatorColumns(); /** * Returns the value of the 'Named Stored Function Queries' 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; *

    * The following features are supported: *

      - *
    • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminators Tenant Discriminators}
      • + *
    • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns Tenant Discriminator Columns}
      • *
    *

    * @@ -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 'Tenant Discriminators' 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 'Tenant Discriminator Columns' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}. * *

    - * If the meaning of the 'Tenant Discriminators' containment reference list isn't clear, + * If the meaning of the 'Tenant Discriminator Columns' containment reference list isn't clear, * there really should be more of a description here... *

    * - * @return the value of the 'Tenant Discriminators' 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 'Tenant Discriminator Columns' 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 getTenantDiscriminators(); + EList 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/XmlTenantDiscriminatorColumn_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 new file mode 100644 index 0000000000..2585c3fe81 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2011 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.jpa.eclipselink.core.resource.orm.v2_3; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Tenant Discriminator2 3'. + * + * + *

    + * The following features are supported: + *

      + *
    • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName Name}
      • + *
    + *

    + * + * @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 XmlTenantDiscriminatorColumn_2_3 extends JpaEObject +{ + + /** + * Returns the value of the 'Name' attribute. + * + *

    + * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); +} // XmlTenantDiscriminator2_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/XmlTenantDiscriminator_2_3.java deleted file mode 100644 index fafa07c321..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminator_2_3.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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.jpa.eclipselink.core.resource.orm.v2_3; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; - -/** - * - * A representation of the model object 'Xml Tenant Discriminator2 3'. - * - * - *

    - * The following features are supported: - *

      - *
    • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName Name}
      • - *
    - *

    - * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3() - * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject - * @generated - */ -public interface XmlTenantDiscriminator_2_3 extends JpaEObject -{ - - /** - * Returns the value of the 'Name' attribute. - * - *

    - * If the meaning of the 'Name' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminator_2_3_Name() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminator_2_3#getName Name}' attribute. - * - * - * @param value the new value of the 'Name' attribute. - * @see #getName() - * @generated - */ - void setName(String value); -} // XmlTenantDiscriminator2_3 -- cgit v1.2.3