summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2013-01-23 09:41:15 (EST)
committerKaren Butzke2013-01-23 09:41:51 (EST)
commitc0a0f9708726c300b362bb518ebea6d5d6e695d1 (patch)
treef262681723d00a2f135be1eb6bd7bec4301f0c41
parent0115155df22167d736d12e06cb51ac7545bbc272 (diff)
downloadwebtools.dali-c0a0f9708726c300b362bb518ebea6d5d6e695d1.zip
webtools.dali-c0a0f9708726c300b362bb518ebea6d5d6e695d1.tar.gz
webtools.dali-c0a0f9708726c300b362bb518ebea6d5d6e695d1.tar.bz2
394284 - JPA 2.1 orm.xml resource model and EL 2.5 eclipselink-orm.xml resource modelv201301232244
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel148
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore250
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java89
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java300
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmFactory.java118
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java1740
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java111
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java112
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java282
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvert.java441
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java317
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java78
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java300
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java79
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlForeignKey.java441
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java102
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIndex.java442
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java278
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java280
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java211
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedAttributeNode.java370
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java477
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java43
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java72
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java641
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java374
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java255
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java248
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQuery.java44
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java189
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java)169
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java445
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java176
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java99
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java102
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ColumnResult_2_1.java65
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java84
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Factory.java59
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java3636
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ParameterMode_2_1.java290
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlAssociationOverride_2_1.java65
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlCollectionTable_2_1.java84
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvert_2_1.java146
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvertibleMapping_2_1.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertibleMapping.java)50
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlElementCollection_2_1.java101
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEmbedded_2_1.java57
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntityMappings_2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntity_2_1.java98
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlForeignKey_2_1.java146
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlIndex_2_1.java146
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlJoinTable_2_1.java111
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToMany_2_1.java84
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToOne_2_1.java65
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedAttributeNode_2_1.java119
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedEntityGraph_2_1.java145
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java117
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedSubgraph_2_1.java111
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToMany_2_1.java111
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToOne_2_1.java111
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlQueryContainer_2_1.java57
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSecondaryTable_2_1.java84
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSqlResultSetMapping_2_1.java57
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java149
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTableGenerator_2_1.java57
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTable_2_1.java57
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java50
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedQuery.java140
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java58
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java45
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmNamedQuery2_0.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java35
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel32
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore57
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java1096
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java213
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java103
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvert.java251
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverter.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java180
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java72
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java72
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java106
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java77
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java182
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java93
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java442
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java82
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java105
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java119
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java33
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlElementCollection_2_0.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java21
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java29
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Factory.java115
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Package.java362
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/XmlManyToOne_2_5.java65
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java47
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java29
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java21
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java41
-rw-r--r--jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java41
117 files changed, 18106 insertions, 2751 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
index 13fef4d..09bd252 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/jpaResourceModels.genmodel
@@ -135,6 +135,8 @@
<genClasses ecoreClass="orm.ecore#//ColumnResult">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//ColumnResult/name"/>
</genClasses>
+ <genClasses ecoreClass="orm.ecore#//ConstructorResult"/>
+ <genClasses ecoreClass="orm.ecore#//XmlConvert"/>
<genClasses ecoreClass="orm.ecore#//XmlConverter"/>
<genClasses image="false" ecoreClass="orm.ecore#//XmlConvertibleMapping">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlConvertibleMapping/lob"/>
@@ -199,6 +201,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//FieldResult/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//FieldResult/column"/>
</genClasses>
+ <genClasses ecoreClass="orm.ecore#//XmlForeignKey"/>
<genClasses image="false" ecoreClass="orm.ecore#//XmlGeneratedValue">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGeneratedValue/generator"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlGeneratedValue/strategy"/>
@@ -218,6 +221,7 @@
<genClasses image="false" ecoreClass="orm.ecore#//XmlIdClassContainer">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlIdClassContainer/idClass"/>
</genClasses>
+ <genClasses ecoreClass="orm.ecore#//XmlIndex"/>
<genClasses ecoreClass="orm.ecore#//Inheritance">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//Inheritance/strategy"/>
</genClasses>
@@ -245,11 +249,18 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlMappedSuperclass/excludeSuperclassListeners"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlMappedSuperclass/entityListeners"/>
</genClasses>
+ <genClasses ecoreClass="orm.ecore#//XmlNamedAttributeNode"/>
+ <genClasses ecoreClass="orm.ecore#//XmlNamedEntityGraph"/>
+ <genClasses ecoreClass="orm.ecore#//XmlNamedSubgraph"/>
<genClasses ecoreClass="orm.ecore#//XmlNamedNativeQuery">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedNativeQuery/query"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedNativeQuery/resultClass"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedNativeQuery/resultSetMapping"/>
</genClasses>
- <genClasses ecoreClass="orm.ecore#//XmlNamedQuery"/>
+ <genClasses ecoreClass="orm.ecore#//XmlNamedQuery">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlNamedQuery/query"/>
+ </genClasses>
+ <genClasses ecoreClass="orm.ecore#//XmlNamedStoredProcedureQuery"/>
<genClasses image="false" ecoreClass="orm.ecore#//XmlNullAttributeMapping"/>
<genClasses image="false" ecoreClass="orm.ecore#//XmlOneToMany"/>
<genClasses image="false" ecoreClass="orm.ecore#//XmlOneToOne"/>
@@ -286,7 +297,6 @@
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//XmlQuery">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlQuery/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlQuery/query"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlQuery/hints"/>
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//XmlQueryContainer">
@@ -303,11 +313,12 @@
<genClasses image="false" ecoreClass="orm.ecore#//XmlSequenceGenerator">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlSequenceGenerator/sequenceName"/>
</genClasses>
- <genClasses ecoreClass="orm.ecore#//SqlResultSetMapping">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//SqlResultSetMapping/name"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//SqlResultSetMapping/entityResults"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//SqlResultSetMapping/columnResults"/>
+ <genClasses ecoreClass="orm.ecore#//XmlSqlResultSetMapping">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlSqlResultSetMapping/name"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlSqlResultSetMapping/entityResults"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlSqlResultSetMapping/columnResults"/>
</genClasses>
+ <genClasses ecoreClass="orm.ecore#//XmlStoredProcedureParameter"/>
<genClasses ecoreClass="orm.ecore#//XmlTable"/>
<genClasses image="false" ecoreClass="orm.ecore#//XmlTableGenerator">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlTableGenerator/table"/>
@@ -442,16 +453,139 @@
</nestedGenPackages>
<nestedGenPackages prefix="OrmV2_1" basePackage="org.eclipse.jpt.jpa.core.resource.orm"
disposableProviderFactory="true" adapterFactory="false" ecorePackage="orm.ecore#//v2_1">
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//v2_1/ParameterMode_2_1">
+ <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_1/ParameterMode_2_1/IN"/>
+ <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_1/ParameterMode_2_1/INOUT"/>
+ <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_1/ParameterMode_2_1/OUT"/>
+ <genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_1/ParameterMode_2_1/REF_CURSOR"/>
+ </genEnums>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/ColumnResult_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/ColumnResult_2_1/className"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/ConstructorResult_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/ConstructorResult_2_1/targetClass"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true"
+ ecoreFeature="ecore:EReference orm.ecore#//v2_1/ConstructorResult_2_1/columnResults"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlAssociationOverride_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlAssociationOverride_2_1/foreignKey"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlCollectionTable_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlCollectionTable_2_1/foreignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlCollectionTable_2_1/indexes"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlConvert_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConvert_2_1/description"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConvert_2_1/converter"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConvert_2_1/attributeName"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConvert_2_1/disableConversion"/>
+ </genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlConverter_2_1">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConverter_2_1/description"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConverter_2_1/className"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlConverter_2_1/autoApply"/>
</genClasses>
- <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlEntityMappings_2_1"/>
<genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlConverterContainer_2_1">
<genFeatures notify="false" createChild="false" propertySortChoices="true"
ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlConverterContainer_2_1/converters"/>
</genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlConvertibleMapping_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlConvertibleMapping_2_1/convert"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlElementCollection_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlElementCollection_2_1/mapKeyConverts"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlElementCollection_2_1/mapKeyForeignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlElementCollection_2_1/converts"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlEmbedded_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlEmbedded_2_1/converts"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlEntity_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlEntity_2_1/primaryKeyForeignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlEntity_2_1/converts"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlEntity_2_1/namedEntityGraphs"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlEntityMappings_2_1"/>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlForeignKey_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlForeignKey_2_1/description"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlForeignKey_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlForeignKey_2_1/foreignKeyDefinition"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlForeignKey_2_1/disableForeignKey"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlIndex_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlIndex_2_1/description"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlIndex_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlIndex_2_1/columnList"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlIndex_2_1/unique"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlJoinTable_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlJoinTable_2_1/foreignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlJoinTable_2_1/inverseForeignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlJoinTable_2_1/indexes"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlManyToMany_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlManyToMany_2_1/mapKeyConverts"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlManyToMany_2_1/mapKeyForeignKey"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlManyToOne_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlManyToOne_2_1/foreignKey"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlNamedAttributeNode_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedAttributeNode_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedAttributeNode_2_1/subgraph"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedAttributeNode_2_1/keySubgraph"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlNamedEntityGraph_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlNamedEntityGraph_2_1/namedAttributeNodes"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlNamedEntityGraph_2_1/subgraphs"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlNamedEntityGraph_2_1/subclassSubgraphs"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedEntityGraph_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedEntityGraph_2_1/includeAllAttributes"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlNamedStoredProcedureQuery_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedStoredProcedureQuery_2_1/resultClasses"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedStoredProcedureQuery_2_1/resultSetMappings"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedStoredProcedureQuery_2_1/procedureName"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true"
+ ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlNamedStoredProcedureQuery_2_1/parameters"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlNamedSubgraph_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlNamedSubgraph_2_1/namedAttributeNodes"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedSubgraph_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlNamedSubgraph_2_1/className"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlOneToMany_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlOneToMany_2_1/mapKeyConverts"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlOneToMany_2_1/mapKeyForeignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlOneToMany_2_1/foreignKey"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlOneToOne_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlOneToOne_2_1/mapKeyConverts"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlOneToOne_2_1/primaryKeyForeignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlOneToOne_2_1/foreignKey"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlQueryContainer_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlQueryContainer_2_1/namedStoredProcedureQueries"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlSecondaryTable_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlSecondaryTable_2_1/primaryKeyForeignKey"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlSecondaryTable_2_1/indexes"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/description"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/parameterMode"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_1/XmlStoredProcedureParameter_2_1/className"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlSqlResultSetMapping_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlSqlResultSetMapping_2_1/constructorResults"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlTable_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlTable_2_1/indexes"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_1/XmlTableGenerator_2_1">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_1/XmlTableGenerator_2_1/indexes"/>
+ </genClasses>
</nestedGenPackages>
</genPackages>
<genPackages prefix="Persistence" basePackage="org.eclipse.jpt.jpa.core.resource"
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
index 46e662e..0d42171 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
@@ -68,7 +68,7 @@
interface="true" eSuperTypes="#//v2_0/XmlAttributeMapping_2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride" eSuperTypes="#//XmlOverride #//XmlJoinColumnContainer #//v2_0/XmlAssociationOverride_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride" eSuperTypes="#//XmlOverride #//XmlJoinColumnContainer #//v2_0/XmlAssociationOverride_2_0 #//v2_1/XmlAssociationOverride_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverrideContainer" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="associationOverrides" upperBound="-1"
@@ -121,7 +121,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable" eSuperTypes="#//AbstractXmlReferenceTable #//v2_0/XmlCollectionTable_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable" eSuperTypes="#//AbstractXmlReferenceTable #//v2_0/XmlCollectionTable_2_0 #//v2_1/XmlCollectionTable_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlColumn" eSuperTypes="#//AbstractXmlBaseColumn">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="precision" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/>
@@ -131,22 +131,24 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//XmlColumn"
containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ColumnResult">
+ <eClassifiers xsi:type="ecore:EClass" name="ColumnResult" eSuperTypes="#//v2_1/ColumnResult_2_1">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ConstructorResult" eSuperTypes="#//v2_1/ConstructorResult_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlConvert" eSuperTypes="#//v2_1/XmlConvert_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlConverter" eSuperTypes="#//v2_1/XmlConverter_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping" abstract="true"
- interface="true">
+ interface="true" eSuperTypes="#//v2_1/XmlConvertibleMapping_2_1">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="lob" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal" eType="#//TemporalType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enumerated" eType="#//EnumType"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlDiscriminatorColumn" eSuperTypes="#//AbstractXmlBaseDiscriminatorColumn"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="#//AbstractXmlAttributeMapping #//v2_0/XmlElementCollection_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection" eSuperTypes="#//AbstractXmlAttributeMapping #//v2_0/XmlElementCollection_2_0 #//v2_1/XmlElementCollection_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="#//AbstractXmlTypeMapping"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="#//AbstractXmlEmbedded #//v2_0/XmlEmbedded_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" eSuperTypes="#//AbstractXmlEmbedded #//v2_0/XmlEmbedded_2_0 #//v2_1/XmlEmbedded_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" eSuperTypes="#//AbstractXmlEmbedded"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="#//AbstractXmlTypeMapping #//XmlQueryContainer #//XmlGeneratorContainer #//XmlEventMethodContainer #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlEntity_2_0 #//XmlIdClassContainer">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="#//AbstractXmlTypeMapping #//XmlQueryContainer #//XmlGeneratorContainer #//XmlEventMethodContainer #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlEntity_2_0 #//XmlIdClassContainer #//v2_1/XmlEntity_2_1">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//XmlTable"
containment="true" resolveProxies="false"/>
@@ -160,7 +162,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="discriminatorColumn" eType="#//XmlDiscriminatorColumn"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"
- eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/>
+ eType="#//XmlSqlResultSetMapping" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeSuperclassListeners"
@@ -188,7 +190,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerators" upperBound="-1"
eType="#//XmlTableGenerator" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"
- eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/>
+ eType="#//XmlSqlResultSetMapping" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mappedSuperclasses" upperBound="-1"
eType="#//XmlMappedSuperclass" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="entities" upperBound="-1"
@@ -229,6 +231,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="column" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlForeignKey" eSuperTypes="#//v2_1/XmlForeignKey_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlGeneratedValue">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="generator" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//GenerationType"
@@ -256,6 +259,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="idClass" eType="#//XmlClassReference"
containment="true" resolveProxies="false"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlIndex" eSuperTypes="#//v2_1/XmlIndex_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="Inheritance">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//InheritanceType"
defaultValueLiteral="SINGLE_TABLE"/>
@@ -266,7 +270,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1"
eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" eSuperTypes="#//AbstractXmlReferenceTable">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" eSuperTypes="#//AbstractXmlReferenceTable #//v2_1/XmlJoinTable_2_1">
<eStructuralFeatures xsi:type="ecore:EReference" name="inverseJoinColumns" upperBound="-1"
eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
</eClassifiers>
@@ -276,8 +280,8 @@
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Lob"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//v2_0/XmlManyToMany_2_0"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//v2_0/XmlManyToMany_2_0 #//v2_1/XmlManyToMany_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping #//v2_1/XmlManyToOne_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="MapKey">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
@@ -293,15 +297,22 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners"
containment="true" resolveProxies="false"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedAttributeNode" eSuperTypes="#//v2_1/XmlNamedAttributeNode_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedEntityGraph" eSuperTypes="#//v2_1/XmlNamedEntityGraph_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedSubgraph" eSuperTypes="#//v2_1/XmlNamedSubgraph_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedNativeQuery" eSuperTypes="#//XmlQuery">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMapping" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//XmlQuery #//v2_0/XmlNamedQuery_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//XmlQuery #//v2_0/XmlNamedQuery_2_0">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery" eSuperTypes="#//XmlQuery #//v2_1/XmlNamedStoredProcedureQuery_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlNullAttributeMapping" abstract="true"
eSuperTypes="#//AbstractXmlAttributeMapping"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//XmlJoinColumnContainer #//v2_0/XmlOneToMany_2_0"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping #//XmlMappedByMapping #//XmlPrimaryKeyJoinColumnContainer #//v2_0/XmlOneToOne_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//XmlJoinColumnContainer #//v2_0/XmlOneToMany_2_0 #//v2_1/XmlOneToMany_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" eSuperTypes="#//AbstractXmlSingleRelationshipMapping #//XmlMappedByMapping #//XmlPrimaryKeyJoinColumnContainer #//v2_0/XmlOneToOne_2_0 #//v2_1/XmlOneToOne_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlOrderable" abstract="true" interface="true"
eSuperTypes="#//v2_0/XmlOrderable_2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="orderBy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -343,11 +354,11 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlQuery" abstract="true" interface="true"
eSuperTypes="#//v2_0/XmlQuery_2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1"
eType="#//XmlQueryHint" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer" abstract="true" interface="true">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer" abstract="true" interface="true"
+ eSuperTypes="#//v2_1/XmlQueryContainer_2_1">
<eStructuralFeatures xsi:type="ecore:EReference" name="namedQueries" upperBound="-1"
eType="#//XmlNamedQuery" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedNativeQueries" upperBound="-1"
@@ -357,22 +368,23 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="#//AbstractXmlTable">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="#//AbstractXmlTable #//v2_1/XmlSecondaryTable_2_1">
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"
upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlSequenceGenerator" eSuperTypes="#//XmlGenerator #//v2_0/XmlSequenceGenerator_2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="sequenceName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SqlResultSetMapping" eSuperTypes="#//v2_0/XmlSqlResultSetMapping_2_0">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlSqlResultSetMapping" eSuperTypes="#//v2_0/XmlSqlResultSetMapping_2_0 #//v2_1/XmlSqlResultSetMapping_2_1">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="entityResults" upperBound="-1"
eType="#//EntityResult" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1"
eType="#//ColumnResult" containment="true" resolveProxies="false"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="#//AbstractXmlTable"/>
- <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="#//XmlGenerator">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter" eSuperTypes="#//v2_1/XmlStoredProcedureParameter_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="#//AbstractXmlTable #//v2_1/XmlTable_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" eSuperTypes="#//XmlGenerator #//v2_1/XmlTableGenerator_2_1">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -581,6 +593,36 @@
</eClassifiers>
</eSubpackages>
<eSubpackages name="v2_1" nsURI="jpt.orm.v2_1.xmi" nsPrefix="org.eclipse.jpt.jpa.core.resource.orm.v2_1">
+ <eClassifiers xsi:type="ecore:EClass" name="ColumnResult_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ConstructorResult_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1"
+ eType="#//v2_1/ColumnResult_2_1" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
+ eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlConvert_2_1" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="converter" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="disableConversion" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlConverter_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -588,12 +630,174 @@
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="autoApply" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_1" abstract="true"
- interface="true" eSuperTypes="#//v2_1/XmlConverterContainer_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlConverterContainer_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="converters" upperBound="-1"
eType="#//v2_1/XmlConverter_2_1" containment="true"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="convert" eType="#//v2_1/XmlConvert_2_1"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="converts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_1" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="converts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_1" abstract="true" interface="true"
+ eSuperTypes="#//v2_1/XmlQueryContainer_2_1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
+ eType="#//v2_1/XmlForeignKey_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="converts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="namedEntityGraphs" upperBound="-1"
+ eType="#//v2_1/XmlNamedEntityGraph_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_1" abstract="true"
+ interface="true" eSuperTypes="#//v2_1/XmlConverterContainer_2_1 #//v2_1/XmlQueryContainer_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlForeignKey_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="foreignKeyDefinition"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="disableForeignKey" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlIndex_2_1" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnList" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="inverseForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
+ eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedAttributeNode_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="subgraph" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="keySubgraph" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedEntityGraph_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="namedAttributeNodes"
+ upperBound="-1" eType="#//v2_1/XmlNamedAttributeNode_2_1" containment="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subgraphs" upperBound="-1"
+ eType="#//v2_1/XmlNamedSubgraph_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subclassSubgraphs" upperBound="-1"
+ eType="#//v2_1/XmlNamedSubgraph_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="includeAllAttributes"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery_2_1"
+ abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClasses" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMappings" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="procedureName" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+ eType="#//v2_1/XmlStoredProcedureParameter_2_1" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedSubgraph_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="namedAttributeNodes"
+ upperBound="-1" eType="#//v2_1/XmlNamedAttributeNode_2_1" containment="true"
+ resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_1" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
+ eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
+ eType="#//v2_1/XmlForeignKey_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredProcedureQueries"
+ upperBound="-1" eType="#//v2_1/XmlNamedStoredProcedureQuery_2_1" containment="true"
+ resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
+ eType="#//v2_1/XmlForeignKey_2_1" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
+ eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterMode" eType="#//v2_1/ParameterMode_2_1"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlSqlResultSetMapping_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="constructorResults" upperBound="-1"
+ eType="#//v2_1/ConstructorResult_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlTable_2_1" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
+ eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator_2_1" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
+ eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="ParameterMode_2_1">
+ <eLiterals name="IN"/>
+ <eLiterals name="INOUT" value="1"/>
+ <eLiterals name="OUT" value="2"/>
+ <eLiterals name="REF_CURSOR" value="3"/>
+ </eClassifiers>
</eSubpackages>
</ecore:EPackage>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java
index 2e451b0..21134ec 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ColumnResult.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -14,8 +14,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -38,12 +39,31 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
*
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnResult()
* @model kind="class"
- * @extends EBaseObject
* @generated
*/
-public class ColumnResult extends EBaseObjectImpl implements EBaseObject
+public class ColumnResult extends EBaseObjectImpl implements ColumnResult_2_1
{
/**
+ * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassName()
+ * @generated
+ * @ordered
+ */
+ protected String className = CLASS_NAME_EDEFAULT;
+
+ /**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -85,6 +105,41 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
}
/**
+ * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Class Name</em>' attribute.
+ * @see #setClassName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnResult_2_1_ClassName()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getClassName()
+ {
+ return className;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.ColumnResult#getClassName <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Class Name</em>' attribute.
+ * @see #getClassName()
+ * @generated
+ */
+ public void setClassName(String newClassName)
+ {
+ String oldClassName = className;
+ className = newClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.COLUMN_RESULT__CLASS_NAME, oldClassName, className));
+ }
+
+ /**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -129,6 +184,8 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
{
switch (featureID)
{
+ case OrmPackage.COLUMN_RESULT__CLASS_NAME:
+ return getClassName();
case OrmPackage.COLUMN_RESULT__NAME:
return getName();
}
@@ -145,6 +202,9 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
{
switch (featureID)
{
+ case OrmPackage.COLUMN_RESULT__CLASS_NAME:
+ setClassName((String)newValue);
+ return;
case OrmPackage.COLUMN_RESULT__NAME:
setName((String)newValue);
return;
@@ -162,6 +222,9 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
{
switch (featureID)
{
+ case OrmPackage.COLUMN_RESULT__CLASS_NAME:
+ setClassName(CLASS_NAME_EDEFAULT);
+ return;
case OrmPackage.COLUMN_RESULT__NAME:
setName(NAME_EDEFAULT);
return;
@@ -179,6 +242,8 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
{
switch (featureID)
{
+ case OrmPackage.COLUMN_RESULT__CLASS_NAME:
+ return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
case OrmPackage.COLUMN_RESULT__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
}
@@ -196,7 +261,9 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
+ result.append(" (className: ");
+ result.append(className);
+ result.append(", name: ");
result.append(name);
result.append(')');
return result.toString();
@@ -205,17 +272,27 @@ public class ColumnResult extends EBaseObjectImpl implements EBaseObject
// ********** translators **********
public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
- return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getColumnResult(),
+ buildTranslatorChildren()
+ );
}
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
buildNameTranslator(),
+ buildClassTranslator(),
};
}
protected static Translator buildNameTranslator() {
return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getColumnResult_Name(), Translator.DOM_ATTRIBUTE);
}
+
+ protected static Translator buildClassTranslator() {
+ return new Translator(JPA.CLASS, OrmV2_1Package.eINSTANCE.getColumnResult_2_1_ClassName(), Translator.DOM_ATTRIBUTE);
+ }
} // ColumnResult
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
new file mode 100644
index 0000000..885237e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
@@ -0,0 +1,300 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.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.InternalEObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+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;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constructor Result</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult()
+ * @model kind="class"
+ * @generated
+ */
+public class ConstructorResult extends EBaseObjectImpl implements ConstructorResult_2_1
+{
+ /**
+ * The default value of the '{@link #getTargetClass() <em>Target Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTargetClass()
+ * @generated
+ * @ordered
+ */
+ protected static final String TARGET_CLASS_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getTargetClass() <em>Target Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTargetClass()
+ * @generated
+ * @ordered
+ */
+ protected String targetClass = TARGET_CLASS_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getColumnResults() <em>Column Results</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getColumnResults()
+ * @generated
+ * @ordered
+ */
+ protected EList<ColumnResult_2_1> columnResults;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ConstructorResult()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.CONSTRUCTOR_RESULT;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Target Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Target Class</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Target Class</em>' attribute.
+ * @see #setTargetClass(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult_2_1_TargetClass()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getTargetClass()
+ {
+ return targetClass;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult#getTargetClass <em>Target Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Target Class</em>' attribute.
+ * @see #getTargetClass()
+ * @generated
+ */
+ public void setTargetClass(String newTargetClass)
+ {
+ String oldTargetClass = targetClass;
+ targetClass = newTargetClass;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS, oldTargetClass, targetClass));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Column Results</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Column Results</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult_2_1_ColumnResults()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<ColumnResult_2_1> getColumnResults()
+ {
+ if (columnResults == null)
+ {
+ columnResults = new EObjectContainmentEList<ColumnResult_2_1>(ColumnResult_2_1.class, this, OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS);
+ }
+ return columnResults;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
+ return ((InternalEList<?>)getColumnResults()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
+ return getTargetClass();
+ case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
+ return getColumnResults();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
+ setTargetClass((String)newValue);
+ return;
+ case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
+ getColumnResults().clear();
+ getColumnResults().addAll((Collection<? extends ColumnResult_2_1>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
+ setTargetClass(TARGET_CLASS_EDEFAULT);
+ return;
+ case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
+ getColumnResults().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.CONSTRUCTOR_RESULT__TARGET_CLASS:
+ return TARGET_CLASS_EDEFAULT == null ? targetClass != null : !TARGET_CLASS_EDEFAULT.equals(targetClass);
+ case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
+ return columnResults != null && !columnResults.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (targetClass: ");
+ result.append(targetClass);
+ result.append(')');
+ return result.toString();
+ }
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getConstructorResult(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildColumnTranslator(),
+ buildTargetClassTranslator(),
+ };
+ }
+
+ protected static Translator buildColumnTranslator() {
+ return ColumnResult.buildTranslator(JPA2_1.COLUMN, OrmV2_1Package.eINSTANCE.getConstructorResult_2_1_ColumnResults());
+ }
+
+ protected static Translator buildTargetClassTranslator() {
+ return new Translator(JPA2_1.TARGET_CLASS, OrmV2_1Package.eINSTANCE.getConstructorResult_2_1_TargetClass(), Translator.DOM_ATTRIBUTE);
+ }
+
+} // ConstructorResult
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmFactory.java
index 0fcf0aa..985b6c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle.
+ * Copyright (c) 2009, 2013 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
@@ -89,6 +89,8 @@ public class OrmFactory extends EFactoryImpl
case OrmPackage.XML_COLLECTION_TABLE: return (EObject)createXmlCollectionTable();
case OrmPackage.XML_COLUMN: return (EObject)createXmlColumn();
case OrmPackage.COLUMN_RESULT: return (EObject)createColumnResult();
+ case OrmPackage.CONSTRUCTOR_RESULT: return (EObject)createConstructorResult();
+ case OrmPackage.XML_CONVERT: return (EObject)createXmlConvert();
case OrmPackage.XML_CONVERTER: return (EObject)createXmlConverter();
case OrmPackage.XML_DISCRIMINATOR_COLUMN: return (EObject)createXmlDiscriminatorColumn();
case OrmPackage.XML_ELEMENT_COLLECTION: return (EObject)createXmlElementCollection();
@@ -101,8 +103,10 @@ public class OrmFactory extends EFactoryImpl
case OrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings();
case OrmPackage.ENTITY_RESULT: return (EObject)createEntityResult();
case OrmPackage.FIELD_RESULT: return (EObject)createFieldResult();
+ case OrmPackage.XML_FOREIGN_KEY: return (EObject)createXmlForeignKey();
case OrmPackage.XML_GENERATED_VALUE: return (EObject)createXmlGeneratedValue();
case OrmPackage.XML_ID: return (EObject)createXmlId();
+ case OrmPackage.XML_INDEX: return (EObject)createXmlIndex();
case OrmPackage.INHERITANCE: return (EObject)createInheritance();
case OrmPackage.XML_JOIN_COLUMN: return (EObject)createXmlJoinColumn();
case OrmPackage.XML_JOIN_TABLE: return (EObject)createXmlJoinTable();
@@ -111,8 +115,12 @@ public class OrmFactory extends EFactoryImpl
case OrmPackage.XML_MANY_TO_ONE: return (EObject)createXmlManyToOne();
case OrmPackage.MAP_KEY: return (EObject)createMapKey();
case OrmPackage.XML_MAPPED_SUPERCLASS: return (EObject)createXmlMappedSuperclass();
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE: return (EObject)createXmlNamedAttributeNode();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH: return (EObject)createXmlNamedEntityGraph();
+ case OrmPackage.XML_NAMED_SUBGRAPH: return (EObject)createXmlNamedSubgraph();
case OrmPackage.XML_NAMED_NATIVE_QUERY: return (EObject)createXmlNamedNativeQuery();
case OrmPackage.XML_NAMED_QUERY: return (EObject)createXmlNamedQuery();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY: return (EObject)createXmlNamedStoredProcedureQuery();
case OrmPackage.XML_ONE_TO_MANY: return (EObject)createXmlOneToMany();
case OrmPackage.XML_ONE_TO_ONE: return (EObject)createXmlOneToOne();
case OrmPackage.XML_ORDER_COLUMN: return (EObject)createXmlOrderColumn();
@@ -129,7 +137,8 @@ public class OrmFactory extends EFactoryImpl
case OrmPackage.XML_QUERY_HINT: return (EObject)createXmlQueryHint();
case OrmPackage.XML_SECONDARY_TABLE: return (EObject)createXmlSecondaryTable();
case OrmPackage.XML_SEQUENCE_GENERATOR: return (EObject)createXmlSequenceGenerator();
- case OrmPackage.SQL_RESULT_SET_MAPPING: return (EObject)createSqlResultSetMapping();
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING: return (EObject)createXmlSqlResultSetMapping();
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER: return (EObject)createXmlStoredProcedureParameter();
case OrmPackage.XML_TABLE: return (EObject)createXmlTable();
case OrmPackage.XML_TABLE_GENERATOR: return (EObject)createXmlTableGenerator();
case OrmPackage.XML_TRANSIENT: return (EObject)createXmlTransient();
@@ -298,6 +307,28 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public ConstructorResult createConstructorResult()
+ {
+ ConstructorResult constructorResult = new ConstructorResult();
+ return constructorResult;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XmlConvert createXmlConvert()
+ {
+ XmlConvert xmlConvert = new XmlConvert();
+ return xmlConvert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public XmlConverter createXmlConverter()
{
XmlConverter xmlConverter = new XmlConverter();
@@ -430,6 +461,17 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public XmlForeignKey createXmlForeignKey()
+ {
+ XmlForeignKey xmlForeignKey = new XmlForeignKey();
+ return xmlForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public XmlGeneratedValue createXmlGeneratedValue()
{
XmlGeneratedValue xmlGeneratedValue = new XmlGeneratedValue();
@@ -452,6 +494,17 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public XmlIndex createXmlIndex()
+ {
+ XmlIndex xmlIndex = new XmlIndex();
+ return xmlIndex;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public Inheritance createInheritance()
{
Inheritance inheritance = new Inheritance();
@@ -540,6 +593,39 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public XmlNamedAttributeNode createXmlNamedAttributeNode()
+ {
+ XmlNamedAttributeNode xmlNamedAttributeNode = new XmlNamedAttributeNode();
+ return xmlNamedAttributeNode;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XmlNamedEntityGraph createXmlNamedEntityGraph()
+ {
+ XmlNamedEntityGraph xmlNamedEntityGraph = new XmlNamedEntityGraph();
+ return xmlNamedEntityGraph;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XmlNamedSubgraph createXmlNamedSubgraph()
+ {
+ XmlNamedSubgraph xmlNamedSubgraph = new XmlNamedSubgraph();
+ return xmlNamedSubgraph;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public XmlNamedNativeQuery createXmlNamedNativeQuery()
{
XmlNamedNativeQuery xmlNamedNativeQuery = new XmlNamedNativeQuery();
@@ -562,6 +648,28 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
+ public XmlNamedStoredProcedureQuery createXmlNamedStoredProcedureQuery()
+ {
+ XmlNamedStoredProcedureQuery xmlNamedStoredProcedureQuery = new XmlNamedStoredProcedureQuery();
+ return xmlNamedStoredProcedureQuery;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public XmlStoredProcedureParameter createXmlStoredProcedureParameter()
+ {
+ XmlStoredProcedureParameter xmlStoredProcedureParameter = new XmlStoredProcedureParameter();
+ return xmlStoredProcedureParameter;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public XmlOneToMany createXmlOneToMany()
{
XmlOneToMany xmlOneToMany = new XmlOneToMany();
@@ -738,10 +846,10 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- public SqlResultSetMapping createSqlResultSetMapping()
+ public XmlSqlResultSetMapping createXmlSqlResultSetMapping()
{
- SqlResultSetMapping sqlResultSetMapping = new SqlResultSetMapping();
- return sqlResultSetMapping;
+ XmlSqlResultSetMapping xmlSqlResultSetMapping = new XmlSqlResultSetMapping();
+ return xmlSqlResultSetMapping;
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
index 51d144a..b3f35a5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -1013,7 +1013,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping()
* @generated
*/
- public static final int XML_TYPE_MAPPING = 89;
+ public static final int XML_TYPE_MAPPING = 98;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}' class.
@@ -1275,7 +1275,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOverride()
* @generated
*/
- public static final int XML_OVERRIDE = 67;
+ public static final int XML_OVERRIDE = 75;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1332,13 +1332,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ASSOCIATION_OVERRIDE__DESCRIPTION = XML_OVERRIDE_FEATURE_COUNT + 2;
/**
+ * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY = XML_OVERRIDE_FEATURE_COUNT + 3;
+
+ /**
* The number of structural features of the '<em>Xml Association Override</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ASSOCIATION_OVERRIDE_FEATURE_COUNT = XML_OVERRIDE_FEATURE_COUNT + 3;
+ public static final int XML_ASSOCIATION_OVERRIDE_FEATURE_COUNT = XML_OVERRIDE_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
@@ -1557,13 +1566,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_BASIC__COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_BASIC__CONVERT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+
+ /**
* The feature id for the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_BASIC__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_BASIC__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Temporal</b></em>' attribute.
@@ -1572,7 +1590,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_BASIC__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_BASIC__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Enumerated</b></em>' attribute.
@@ -1581,7 +1599,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_BASIC__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_BASIC__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Fetch</b></em>' attribute.
@@ -1590,7 +1608,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_BASIC__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_BASIC__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Optional</b></em>' attribute.
@@ -1599,7 +1617,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_BASIC__OPTIONAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_BASIC__OPTIONAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
/**
* The number of structural features of the '<em>Xml Basic</em>' class.
@@ -1608,7 +1626,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_BASIC_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_BASIC_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Cascade Detach</b></em>' attribute.
@@ -1757,13 +1775,31 @@ public class OrmPackage extends EPackageImpl
public static final int XML_COLLECTION_TABLE__JOIN_COLUMNS = ABSTRACT_XML_REFERENCE_TABLE__JOIN_COLUMNS;
/**
+ * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_COLLECTION_TABLE__FOREIGN_KEY = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_COLLECTION_TABLE__INDEXES = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Xml Collection Table</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_COLLECTION_TABLE_FEATURE_COUNT = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 0;
+ public static final int XML_COLLECTION_TABLE_FEATURE_COUNT = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlColumn <em>Xml Column</em>}' class.
@@ -1913,13 +1949,22 @@ public class OrmPackage extends EPackageImpl
public static final int COLUMN_RESULT = 28;
/**
+ * The feature id for the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int COLUMN_RESULT__CLASS_NAME = OrmV2_1Package.COLUMN_RESULT_21__CLASS_NAME;
+
+ /**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int COLUMN_RESULT__NAME = 0;
+ public static final int COLUMN_RESULT__NAME = OrmV2_1Package.COLUMN_RESULT_21_FEATURE_COUNT + 0;
/**
* The number of structural features of the '<em>Column Result</em>' class.
@@ -1928,7 +1973,99 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int COLUMN_RESULT_FEATURE_COUNT = 1;
+ public static final int COLUMN_RESULT_FEATURE_COUNT = OrmV2_1Package.COLUMN_RESULT_21_FEATURE_COUNT + 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult <em>Constructor Result</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult()
+ * @generated
+ */
+ public static final int CONSTRUCTOR_RESULT = 29;
+
+ /**
+ * The feature id for the '<em><b>Target Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int CONSTRUCTOR_RESULT__TARGET_CLASS = OrmV2_1Package.CONSTRUCTOR_RESULT_21__TARGET_CLASS;
+
+ /**
+ * The feature id for the '<em><b>Column Results</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int CONSTRUCTOR_RESULT__COLUMN_RESULTS = OrmV2_1Package.CONSTRUCTOR_RESULT_21__COLUMN_RESULTS;
+
+ /**
+ * The number of structural features of the '<em>Constructor Result</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int CONSTRUCTOR_RESULT_FEATURE_COUNT = OrmV2_1Package.CONSTRUCTOR_RESULT_21_FEATURE_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert <em>Xml Convert</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlConvert
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert()
+ * @generated
+ */
+ public static final int XML_CONVERT = 30;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_CONVERT__DESCRIPTION = OrmV2_1Package.XML_CONVERT_21__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Converter</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_CONVERT__CONVERTER = OrmV2_1Package.XML_CONVERT_21__CONVERTER;
+
+ /**
+ * The feature id for the '<em><b>Attribute Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_CONVERT__ATTRIBUTE_NAME = OrmV2_1Package.XML_CONVERT_21__ATTRIBUTE_NAME;
+
+ /**
+ * The feature id for the '<em><b>Disable Conversion</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_CONVERT__DISABLE_CONVERSION = OrmV2_1Package.XML_CONVERT_21__DISABLE_CONVERSION;
+
+ /**
+ * The number of structural features of the '<em>Xml Convert</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_CONVERT_FEATURE_COUNT = OrmV2_1Package.XML_CONVERT_21_FEATURE_COUNT + 0;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
@@ -1938,7 +2075,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter()
* @generated
*/
- public static final int XML_CONVERTER = 29;
+ public static final int XML_CONVERTER = 31;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1984,7 +2121,16 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping()
* @generated
*/
- public static final int XML_CONVERTIBLE_MAPPING = 30;
+ public static final int XML_CONVERTIBLE_MAPPING = 32;
+
+ /**
+ * The feature id for the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_CONVERTIBLE_MAPPING__CONVERT = OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT;
/**
* The feature id for the '<em><b>Lob</b></em>' attribute.
@@ -1993,7 +2139,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_CONVERTIBLE_MAPPING__LOB = 0;
+ public static final int XML_CONVERTIBLE_MAPPING__LOB = OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Temporal</b></em>' attribute.
@@ -2002,7 +2148,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_CONVERTIBLE_MAPPING__TEMPORAL = 1;
+ public static final int XML_CONVERTIBLE_MAPPING__TEMPORAL = OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Enumerated</b></em>' attribute.
@@ -2011,7 +2157,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_CONVERTIBLE_MAPPING__ENUMERATED = 2;
+ public static final int XML_CONVERTIBLE_MAPPING__ENUMERATED = OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21_FEATURE_COUNT + 2;
/**
* The number of structural features of the '<em>Xml Convertible Mapping</em>' class.
@@ -2020,7 +2166,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_CONVERTIBLE_MAPPING_FEATURE_COUNT = 3;
+ public static final int XML_CONVERTIBLE_MAPPING_FEATURE_COUNT = OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21_FEATURE_COUNT + 3;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlDiscriminatorColumn <em>Xml Discriminator Column</em>}' class.
@@ -2030,7 +2176,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn()
* @generated
*/
- public static final int XML_DISCRIMINATOR_COLUMN = 31;
+ public static final int XML_DISCRIMINATOR_COLUMN = 33;
/**
* The feature id for the '<em><b>Column Definition</b></em>' attribute.
@@ -2085,7 +2231,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection()
* @generated
*/
- public static final int XML_ELEMENT_COLLECTION = 32;
+ public static final int XML_ELEMENT_COLLECTION = 34;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2106,13 +2252,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION__NAME = ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
/**
+ * The feature id for the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ELEMENT_COLLECTION__CONVERT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
+ public static final int XML_ELEMENT_COLLECTION__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Temporal</b></em>' attribute.
@@ -2121,7 +2276,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_ELEMENT_COLLECTION__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Enumerated</b></em>' attribute.
@@ -2130,7 +2285,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_ELEMENT_COLLECTION__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -2139,7 +2294,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__ORDER_COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_ELEMENT_COLLECTION__ORDER_COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Order By</b></em>' attribute.
@@ -2148,7 +2303,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__ORDER_BY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_ELEMENT_COLLECTION__ORDER_BY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
@@ -2157,7 +2312,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__ATTRIBUTE_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_ELEMENT_COLLECTION__ATTRIBUTE_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
@@ -2166,7 +2321,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
@@ -2175,7 +2330,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
@@ -2184,7 +2339,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
@@ -2193,7 +2348,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 9;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Target Class</b></em>' attribute.
@@ -2202,7 +2357,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 10;
+ public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Fetch</b></em>' attribute.
@@ -2211,7 +2366,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
+ public static final int XML_ELEMENT_COLLECTION__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Map Key</b></em>' containment reference.
@@ -2220,7 +2375,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
@@ -2229,7 +2384,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -2238,7 +2393,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 14;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
@@ -2247,7 +2402,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 15;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Column</b></em>' containment reference.
@@ -2256,7 +2411,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 16;
+ public static final int XML_ELEMENT_COLLECTION__COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Collection Table</b></em>' containment reference.
@@ -2265,7 +2420,34 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__COLLECTION_TABLE = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 17;
+ public static final int XML_ELEMENT_COLLECTION__COLLECTION_TABLE = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 18;
+
+ /**
+ * The feature id for the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 19;
+
+ /**
+ * The feature id for the '<em><b>Map Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 20;
+
+ /**
+ * The feature id for the '<em><b>Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ELEMENT_COLLECTION__CONVERTS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 21;
/**
* The number of structural features of the '<em>Xml Element Collection</em>' class.
@@ -2274,7 +2456,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 18;
+ public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 22;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
@@ -2284,7 +2466,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbeddable()
* @generated
*/
- public static final int XML_EMBEDDABLE = 33;
+ public static final int XML_EMBEDDABLE = 35;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2348,7 +2530,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbedded()
* @generated
*/
- public static final int XML_EMBEDDED = 34;
+ public static final int XML_EMBEDDED = 36;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2387,13 +2569,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_EMBEDDED__ASSOCIATION_OVERRIDES = ABSTRACT_XML_EMBEDDED_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_EMBEDDED__CONVERTS = ABSTRACT_XML_EMBEDDED_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Xml Embedded</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_EMBEDDED_FEATURE_COUNT = ABSTRACT_XML_EMBEDDED_FEATURE_COUNT + 1;
+ public static final int XML_EMBEDDED_FEATURE_COUNT = ABSTRACT_XML_EMBEDDED_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
@@ -2403,7 +2594,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbeddedId()
* @generated
*/
- public static final int XML_EMBEDDED_ID = 35;
+ public static final int XML_EMBEDDED_ID = 37;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2449,7 +2640,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntity()
* @generated
*/
- public static final int XML_ENTITY = 36;
+ public static final int XML_ENTITY = 38;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -2497,13 +2688,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ENTITY__ATTRIBUTES = ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES;
/**
+ * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__NAMED_QUERIES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 0;
+ public static final int XML_ENTITY__NAMED_QUERIES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
@@ -2512,7 +2712,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__NAMED_NATIVE_QUERIES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_ENTITY__NAMED_NATIVE_QUERIES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
@@ -2521,7 +2721,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__SEQUENCE_GENERATOR = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_ENTITY__SEQUENCE_GENERATOR = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Table Generator</b></em>' containment reference.
@@ -2530,7 +2730,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__TABLE_GENERATOR = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_ENTITY__TABLE_GENERATOR = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Pre Persist</b></em>' containment reference.
@@ -2539,7 +2739,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PRE_PERSIST = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_ENTITY__PRE_PERSIST = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Post Persist</b></em>' containment reference.
@@ -2548,7 +2748,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__POST_PERSIST = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_ENTITY__POST_PERSIST = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Pre Remove</b></em>' containment reference.
@@ -2557,7 +2757,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PRE_REMOVE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_ENTITY__PRE_REMOVE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Post Remove</b></em>' containment reference.
@@ -2566,7 +2766,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__POST_REMOVE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_ENTITY__POST_REMOVE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Pre Update</b></em>' containment reference.
@@ -2575,7 +2775,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PRE_UPDATE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 8;
+ public static final int XML_ENTITY__PRE_UPDATE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Post Update</b></em>' containment reference.
@@ -2584,7 +2784,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__POST_UPDATE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 9;
+ public static final int XML_ENTITY__POST_UPDATE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Post Load</b></em>' containment reference.
@@ -2593,7 +2793,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__POST_LOAD = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 10;
+ public static final int XML_ENTITY__POST_LOAD = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
@@ -2602,7 +2802,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__ATTRIBUTE_OVERRIDES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 11;
+ public static final int XML_ENTITY__ATTRIBUTE_OVERRIDES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
@@ -2611,7 +2811,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__ASSOCIATION_OVERRIDES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 12;
+ public static final int XML_ENTITY__ASSOCIATION_OVERRIDES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Cacheable</b></em>' attribute.
@@ -2620,7 +2820,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CACHEABLE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 13;
+ public static final int XML_ENTITY__CACHEABLE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Id Class</b></em>' containment reference.
@@ -2629,7 +2829,34 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__ID_CLASS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 14;
+ public static final int XML_ENTITY__ID_CLASS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 15;
+
+ /**
+ * The feature id for the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 16;
+
+ /**
+ * The feature id for the '<em><b>Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__CONVERTS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 17;
+
+ /**
+ * The feature id for the '<em><b>Named Entity Graphs</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__NAMED_ENTITY_GRAPHS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -2638,7 +2865,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__NAME = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 15;
+ public static final int XML_ENTITY__NAME = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 19;
/**
* The feature id for the '<em><b>Table</b></em>' containment reference.
@@ -2647,7 +2874,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__TABLE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 16;
+ public static final int XML_ENTITY__TABLE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 20;
/**
* The feature id for the '<em><b>Secondary Tables</b></em>' containment reference list.
@@ -2656,7 +2883,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__SECONDARY_TABLES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 17;
+ public static final int XML_ENTITY__SECONDARY_TABLES = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 21;
/**
* The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
@@ -2665,7 +2892,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 18;
+ public static final int XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 22;
/**
* The feature id for the '<em><b>Inheritance</b></em>' containment reference.
@@ -2674,7 +2901,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__INHERITANCE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 19;
+ public static final int XML_ENTITY__INHERITANCE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 23;
/**
* The feature id for the '<em><b>Discriminator Value</b></em>' attribute.
@@ -2683,7 +2910,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__DISCRIMINATOR_VALUE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 20;
+ public static final int XML_ENTITY__DISCRIMINATOR_VALUE = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 24;
/**
* The feature id for the '<em><b>Discriminator Column</b></em>' containment reference.
@@ -2692,7 +2919,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__DISCRIMINATOR_COLUMN = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 21;
+ public static final int XML_ENTITY__DISCRIMINATOR_COLUMN = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 25;
/**
* The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
@@ -2701,7 +2928,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__SQL_RESULT_SET_MAPPINGS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 22;
+ public static final int XML_ENTITY__SQL_RESULT_SET_MAPPINGS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 26;
/**
* The feature id for the '<em><b>Exclude Default Listeners</b></em>' attribute.
@@ -2710,7 +2937,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 23;
+ public static final int XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 27;
/**
* The feature id for the '<em><b>Exclude Superclass Listeners</b></em>' attribute.
@@ -2719,7 +2946,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 24;
+ public static final int XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 28;
/**
* The feature id for the '<em><b>Entity Listeners</b></em>' containment reference.
@@ -2728,7 +2955,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__ENTITY_LISTENERS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 25;
+ public static final int XML_ENTITY__ENTITY_LISTENERS = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 29;
/**
* The number of structural features of the '<em>Xml Entity</em>' class.
@@ -2737,7 +2964,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_FEATURE_COUNT = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 26;
+ public static final int XML_ENTITY_FEATURE_COUNT = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 30;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlEventMethodContainer <em>Xml Event Method Container</em>}' class.
@@ -2747,7 +2974,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEventMethodContainer()
* @generated
*/
- public static final int XML_EVENT_METHOD_CONTAINER = 42;
+ public static final int XML_EVENT_METHOD_CONTAINER = 44;
/**
* The feature id for the '<em><b>Pre Persist</b></em>' containment reference.
@@ -2829,7 +3056,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListener()
* @generated
*/
- public static final int ENTITY_LISTENER = 37;
+ public static final int ENTITY_LISTENER = 39;
/**
* The feature id for the '<em><b>Pre Persist</b></em>' containment reference.
@@ -2929,7 +3156,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListeners()
* @generated
*/
- public static final int ENTITY_LISTENERS = 38;
+ public static final int ENTITY_LISTENERS = 40;
/**
* The feature id for the '<em><b>Entity Listeners</b></em>' containment reference list.
@@ -2957,7 +3184,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntityMappings()
* @generated
*/
- public static final int XML_ENTITY_MAPPINGS = 39;
+ public static final int XML_ENTITY_MAPPINGS = 41;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EntityResult <em>Entity Result</em>}' class.
@@ -2967,7 +3194,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityResult()
* @generated
*/
- public static final int ENTITY_RESULT = 40;
+ public static final int ENTITY_RESULT = 42;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EventMethod <em>Event Method</em>}' class.
@@ -2977,7 +3204,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEventMethod()
* @generated
*/
- public static final int EVENT_METHOD = 41;
+ public static final int EVENT_METHOD = 43;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.FieldResult <em>Field Result</em>}' class.
@@ -2987,7 +3214,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFieldResult()
* @generated
*/
- public static final int FIELD_RESULT = 43;
+ public static final int FIELD_RESULT = 45;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}' class.
@@ -2997,7 +3224,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratedValue()
* @generated
*/
- public static final int XML_GENERATED_VALUE = 44;
+ public static final int XML_GENERATED_VALUE = 47;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
@@ -3007,7 +3234,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGenerator()
* @generated
*/
- public static final int XML_GENERATOR = 45;
+ public static final int XML_GENERATOR = 48;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer <em>Xml Generator Container</em>}' class.
@@ -3017,7 +3244,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratorContainer()
* @generated
*/
- public static final int XML_GENERATOR_CONTAINER = 46;
+ public static final int XML_GENERATOR_CONTAINER = 49;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlId <em>Xml Id</em>}' class.
@@ -3027,7 +3254,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlId()
* @generated
*/
- public static final int XML_ID = 47;
+ public static final int XML_ID = 50;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Inheritance <em>Inheritance</em>}' class.
@@ -3037,7 +3264,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritance()
* @generated
*/
- public static final int INHERITANCE = 49;
+ public static final int INHERITANCE = 53;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn <em>Xml Join Column</em>}' class.
@@ -3047,7 +3274,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumn()
* @generated
*/
- public static final int XML_JOIN_COLUMN = 50;
+ public static final int XML_JOIN_COLUMN = 54;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class.
@@ -3057,7 +3284,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable()
* @generated
*/
- public static final int XML_JOIN_TABLE = 52;
+ public static final int XML_JOIN_TABLE = 56;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Lob <em>Lob</em>}' class.
@@ -3067,7 +3294,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getLob()
* @generated
*/
- public static final int LOB = 54;
+ public static final int LOB = 58;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
@@ -3077,7 +3304,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToMany()
* @generated
*/
- public static final int XML_MANY_TO_MANY = 55;
+ public static final int XML_MANY_TO_MANY = 59;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
@@ -3087,7 +3314,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToOne()
* @generated
*/
- public static final int XML_MANY_TO_ONE = 56;
+ public static final int XML_MANY_TO_ONE = 60;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.MapKey <em>Map Key</em>}' class.
@@ -3097,7 +3324,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getMapKey()
* @generated
*/
- public static final int MAP_KEY = 57;
+ public static final int MAP_KEY = 61;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlMappedByMapping <em>Xml Mapped By Mapping</em>}' class.
@@ -3107,7 +3334,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedByMapping()
* @generated
*/
- public static final int XML_MAPPED_BY_MAPPING = 58;
+ public static final int XML_MAPPED_BY_MAPPING = 62;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
@@ -3117,7 +3344,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedSuperclass()
* @generated
*/
- public static final int XML_MAPPED_SUPERCLASS = 59;
+ public static final int XML_MAPPED_SUPERCLASS = 63;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery <em>Xml Query</em>}' class.
@@ -3127,7 +3354,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery()
* @generated
*/
- public static final int XML_QUERY = 80;
+ public static final int XML_QUERY = 88;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
@@ -3137,7 +3364,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedNativeQuery()
* @generated
*/
- public static final int XML_NAMED_NATIVE_QUERY = 60;
+ public static final int XML_NAMED_NATIVE_QUERY = 67;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
@@ -3147,7 +3374,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedQuery()
* @generated
*/
- public static final int XML_NAMED_QUERY = 61;
+ public static final int XML_NAMED_QUERY = 68;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}' class.
@@ -3157,7 +3384,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNullAttributeMapping()
* @generated
*/
- public static final int XML_NULL_ATTRIBUTE_MAPPING = 62;
+ public static final int XML_NULL_ATTRIBUTE_MAPPING = 70;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
@@ -3167,7 +3394,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany()
* @generated
*/
- public static final int XML_ONE_TO_MANY = 63;
+ public static final int XML_ONE_TO_MANY = 71;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
@@ -3177,7 +3404,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne()
* @generated
*/
- public static final int XML_ONE_TO_ONE = 64;
+ public static final int XML_ONE_TO_ONE = 72;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
@@ -3187,7 +3414,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOrderColumn()
* @generated
*/
- public static final int XML_ORDER_COLUMN = 66;
+ public static final int XML_ORDER_COLUMN = 74;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
@@ -3197,7 +3424,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 68;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 76;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
@@ -3207,7 +3434,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_METADATA = 69;
+ public static final int XML_PERSISTENCE_UNIT_METADATA = 77;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostLoad <em>Post Load</em>}' class.
@@ -3217,7 +3444,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostLoad()
* @generated
*/
- public static final int POST_LOAD = 71;
+ public static final int POST_LOAD = 79;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
@@ -3227,7 +3454,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostPersist()
* @generated
*/
- public static final int POST_PERSIST = 72;
+ public static final int POST_PERSIST = 80;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
@@ -3237,7 +3464,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostRemove()
* @generated
*/
- public static final int POST_REMOVE = 73;
+ public static final int POST_REMOVE = 81;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
@@ -3247,7 +3474,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostUpdate()
* @generated
*/
- public static final int POST_UPDATE = 74;
+ public static final int POST_UPDATE = 82;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
@@ -3257,7 +3484,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPrePersist()
* @generated
*/
- public static final int PRE_PERSIST = 75;
+ public static final int PRE_PERSIST = 83;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
@@ -3267,7 +3494,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPreRemove()
* @generated
*/
- public static final int PRE_REMOVE = 76;
+ public static final int PRE_REMOVE = 84;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
@@ -3277,7 +3504,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPreUpdate()
* @generated
*/
- public static final int PRE_UPDATE = 77;
+ public static final int PRE_UPDATE = 85;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}' class.
@@ -3287,7 +3514,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn()
* @generated
*/
- public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 78;
+ public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 86;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}' class.
@@ -3297,7 +3524,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer()
* @generated
*/
- public static final int XML_QUERY_CONTAINER = 81;
+ public static final int XML_QUERY_CONTAINER = 89;
/**
* The feature id for the '<em><b>Version</b></em>' attribute.
@@ -3327,13 +3554,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ENTITY_MAPPINGS__IMPLIED_VERSION = CommonPackage.EROOT_OBJECT_IMPL__IMPLIED_VERSION;
/**
+ * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__NAMED_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 0;
+ public static final int XML_ENTITY_MAPPINGS__NAMED_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
@@ -3342,7 +3578,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 1;
+ public static final int XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -3351,7 +3587,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__ACCESS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 2;
+ public static final int XML_ENTITY_MAPPINGS__ACCESS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Converters</b></em>' containment reference list.
@@ -3360,7 +3596,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__CONVERTERS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 3;
+ public static final int XML_ENTITY_MAPPINGS__CONVERTERS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -3369,7 +3605,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__DESCRIPTION = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 4;
+ public static final int XML_ENTITY_MAPPINGS__DESCRIPTION = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Persistence Unit Metadata</b></em>' containment reference.
@@ -3378,7 +3614,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 5;
+ public static final int XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Package</b></em>' attribute.
@@ -3387,7 +3623,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__PACKAGE = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 6;
+ public static final int XML_ENTITY_MAPPINGS__PACKAGE = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Schema</b></em>' attribute.
@@ -3396,7 +3632,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__SCHEMA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 7;
+ public static final int XML_ENTITY_MAPPINGS__SCHEMA = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Catalog</b></em>' attribute.
@@ -3405,7 +3641,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__CATALOG = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 8;
+ public static final int XML_ENTITY_MAPPINGS__CATALOG = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list.
@@ -3414,7 +3650,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 9;
+ public static final int XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
@@ -3423,7 +3659,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__TABLE_GENERATORS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 10;
+ public static final int XML_ENTITY_MAPPINGS__TABLE_GENERATORS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
@@ -3432,7 +3668,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 11;
+ public static final int XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Mapped Superclasses</b></em>' containment reference list.
@@ -3441,7 +3677,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 12;
+ public static final int XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Entities</b></em>' containment reference list.
@@ -3450,7 +3686,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__ENTITIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 13;
+ public static final int XML_ENTITY_MAPPINGS__ENTITIES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Embeddables</b></em>' containment reference list.
@@ -3459,7 +3695,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS__EMBEDDABLES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 14;
+ public static final int XML_ENTITY_MAPPINGS__EMBEDDABLES = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 15;
/**
* The number of structural features of the '<em>Xml Entity Mappings</em>' class.
@@ -3468,7 +3704,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 15;
+ public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = CommonPackage.EROOT_OBJECT_IMPL_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Discriminator Column</b></em>' attribute.
@@ -3561,6 +3797,61 @@ public class OrmPackage extends EPackageImpl
public static final int FIELD_RESULT_FEATURE_COUNT = 2;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey <em>Xml Foreign Key</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey()
+ * @generated
+ */
+ public static final int XML_FOREIGN_KEY = 46;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FOREIGN_KEY__DESCRIPTION = OrmV2_1Package.XML_FOREIGN_KEY_21__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FOREIGN_KEY__NAME = OrmV2_1Package.XML_FOREIGN_KEY_21__NAME;
+
+ /**
+ * The feature id for the '<em><b>Foreign Key Definition</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FOREIGN_KEY__FOREIGN_KEY_DEFINITION = OrmV2_1Package.XML_FOREIGN_KEY_21__FOREIGN_KEY_DEFINITION;
+
+ /**
+ * The feature id for the '<em><b>Disable Foreign Key</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FOREIGN_KEY__DISABLE_FOREIGN_KEY = OrmV2_1Package.XML_FOREIGN_KEY_21__DISABLE_FOREIGN_KEY;
+
+ /**
+ * The number of structural features of the '<em>Xml Foreign Key</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FOREIGN_KEY_FEATURE_COUNT = OrmV2_1Package.XML_FOREIGN_KEY_21_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Generator</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3687,13 +3978,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ID__COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ID__CONVERT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+
+ /**
* The feature id for the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ID__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_ID__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Temporal</b></em>' attribute.
@@ -3702,7 +4002,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ID__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_ID__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Enumerated</b></em>' attribute.
@@ -3711,7 +4011,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ID__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_ID__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
@@ -3720,7 +4020,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ID__SEQUENCE_GENERATOR = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_ID__SEQUENCE_GENERATOR = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Table Generator</b></em>' containment reference.
@@ -3729,7 +4029,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ID__TABLE_GENERATOR = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_ID__TABLE_GENERATOR = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Generated Value</b></em>' containment reference.
@@ -3738,7 +4038,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ID__GENERATED_VALUE = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_ID__GENERATED_VALUE = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
/**
* The number of structural features of the '<em>Xml Id</em>' class.
@@ -3747,7 +4047,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ID_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_ID_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIdClassContainer <em>Xml Id Class Container</em>}' class.
@@ -3757,7 +4057,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIdClassContainer()
* @generated
*/
- public static final int XML_ID_CLASS_CONTAINER = 48;
+ public static final int XML_ID_CLASS_CONTAINER = 51;
/**
* The feature id for the '<em><b>Id Class</b></em>' containment reference.
@@ -3778,6 +4078,61 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ID_CLASS_CONTAINER_FEATURE_COUNT = 1;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex <em>Xml Index</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlIndex
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex()
+ * @generated
+ */
+ public static final int XML_INDEX = 52;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_INDEX__DESCRIPTION = OrmV2_1Package.XML_INDEX_21__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_INDEX__NAME = OrmV2_1Package.XML_INDEX_21__NAME;
+
+ /**
+ * The feature id for the '<em><b>Column List</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_INDEX__COLUMN_LIST = OrmV2_1Package.XML_INDEX_21__COLUMN_LIST;
+
+ /**
+ * The feature id for the '<em><b>Unique</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_INDEX__UNIQUE = OrmV2_1Package.XML_INDEX_21__UNIQUE;
+
+ /**
+ * The number of structural features of the '<em>Xml Index</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_INDEX_FEATURE_COUNT = OrmV2_1Package.XML_INDEX_21_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Strategy</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3884,7 +4239,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumnContainer()
* @generated
*/
- public static final int XML_JOIN_COLUMN_CONTAINER = 51;
+ public static final int XML_JOIN_COLUMN_CONTAINER = 55;
/**
* The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
@@ -3912,7 +4267,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlReferenceTable()
* @generated
*/
- public static final int XML_REFERENCE_TABLE = 70;
+ public static final int XML_REFERENCE_TABLE = 78;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3960,13 +4315,40 @@ public class OrmPackage extends EPackageImpl
public static final int XML_JOIN_TABLE__JOIN_COLUMNS = ABSTRACT_XML_REFERENCE_TABLE__JOIN_COLUMNS;
/**
+ * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_JOIN_TABLE__FOREIGN_KEY = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Inverse Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_JOIN_TABLE__INVERSE_FOREIGN_KEY = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_JOIN_TABLE__INDEXES = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 2;
+
+ /**
* The feature id for the '<em><b>Inverse Join Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 0;
+ public static final int XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>Xml Join Table</em>' class.
@@ -3975,7 +4357,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_JOIN_TABLE_FEATURE_COUNT = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 1;
+ public static final int XML_JOIN_TABLE_FEATURE_COUNT = ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT + 4;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTableContainer <em>Xml Join Table Container</em>}' class.
@@ -3985,7 +4367,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTableContainer()
* @generated
*/
- public static final int XML_JOIN_TABLE_CONTAINER = 53;
+ public static final int XML_JOIN_TABLE_CONTAINER = 57;
/**
* The feature id for the '<em><b>Join Table</b></em>' containment reference.
@@ -4159,13 +4541,31 @@ public class OrmPackage extends EPackageImpl
public static final int XML_MANY_TO_MANY__MAP_KEY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY;
/**
+ * The feature id for the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERTS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Map Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Xml Many To Many</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
+ public static final int XML_MANY_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -4258,13 +4658,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_MANY_TO_ONE__OPTIONAL = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING__OPTIONAL;
/**
+ * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MANY_TO_ONE__FOREIGN_KEY = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Xml Many To One</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_ONE_FEATURE_COUNT = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
+ public static final int XML_MANY_TO_ONE_FEATURE_COUNT = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -4393,13 +4802,87 @@ public class OrmPackage extends EPackageImpl
public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode <em>Xml Named Attribute Node</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode()
+ * @generated
+ */
+ public static final int XML_NAMED_ATTRIBUTE_NODE = 64;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_QUERY__DESCRIPTION = OrmV2_0Package.XML_QUERY_20__DESCRIPTION;
+ public static final int XML_NAMED_ATTRIBUTE_NODE__NAME = OrmV2_1Package.XML_NAMED_ATTRIBUTE_NODE_21__NAME;
+
+ /**
+ * The feature id for the '<em><b>Subgraph</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ATTRIBUTE_NODE__SUBGRAPH = OrmV2_1Package.XML_NAMED_ATTRIBUTE_NODE_21__SUBGRAPH;
+
+ /**
+ * The feature id for the '<em><b>Key Subgraph</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ATTRIBUTE_NODE__KEY_SUBGRAPH = OrmV2_1Package.XML_NAMED_ATTRIBUTE_NODE_21__KEY_SUBGRAPH;
+
+ /**
+ * The number of structural features of the '<em>Xml Named Attribute Node</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ATTRIBUTE_NODE_FEATURE_COUNT = OrmV2_1Package.XML_NAMED_ATTRIBUTE_NODE_21_FEATURE_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph <em>Xml Named Entity Graph</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph()
+ * @generated
+ */
+ public static final int XML_NAMED_ENTITY_GRAPH = 65;
+
+ /**
+ * The feature id for the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES = OrmV2_1Package.XML_NAMED_ENTITY_GRAPH_21__NAMED_ATTRIBUTE_NODES;
+
+ /**
+ * The feature id for the '<em><b>Subgraphs</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ENTITY_GRAPH__SUBGRAPHS = OrmV2_1Package.XML_NAMED_ENTITY_GRAPH_21__SUBGRAPHS;
+
+ /**
+ * The feature id for the '<em><b>Subclass Subgraphs</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS = OrmV2_1Package.XML_NAMED_ENTITY_GRAPH_21__SUBCLASS_SUBGRAPHS;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -4408,16 +4891,89 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_QUERY__NAME = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 0;
+ public static final int XML_NAMED_ENTITY_GRAPH__NAME = OrmV2_1Package.XML_NAMED_ENTITY_GRAPH_21__NAME;
/**
- * The feature id for the '<em><b>Query</b></em>' attribute.
+ * The feature id for the '<em><b>Include All Attributes</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ENTITY_GRAPH__INCLUDE_ALL_ATTRIBUTES = OrmV2_1Package.XML_NAMED_ENTITY_GRAPH_21__INCLUDE_ALL_ATTRIBUTES;
+
+ /**
+ * The number of structural features of the '<em>Xml Named Entity Graph</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_ENTITY_GRAPH_FEATURE_COUNT = OrmV2_1Package.XML_NAMED_ENTITY_GRAPH_21_FEATURE_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph <em>Xml Named Subgraph</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph()
+ * @generated
+ */
+ public static final int XML_NAMED_SUBGRAPH = 66;
+
+ /**
+ * The feature id for the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES = OrmV2_1Package.XML_NAMED_SUBGRAPH_21__NAMED_ATTRIBUTE_NODES;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_SUBGRAPH__NAME = OrmV2_1Package.XML_NAMED_SUBGRAPH_21__NAME;
+
+ /**
+ * The feature id for the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_SUBGRAPH__CLASS_NAME = OrmV2_1Package.XML_NAMED_SUBGRAPH_21__CLASS_NAME;
+
+ /**
+ * The number of structural features of the '<em>Xml Named Subgraph</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_SUBGRAPH_FEATURE_COUNT = OrmV2_1Package.XML_NAMED_SUBGRAPH_21_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_QUERY__DESCRIPTION = OrmV2_0Package.XML_QUERY_20__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_QUERY__QUERY = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 1;
+ public static final int XML_QUERY__NAME = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Hints</b></em>' containment reference list.
@@ -4426,7 +4982,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_QUERY__HINTS = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 2;
+ public static final int XML_QUERY__HINTS = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Xml Query</em>' class.
@@ -4435,7 +4991,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_QUERY_FEATURE_COUNT = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 3;
+ public static final int XML_QUERY_FEATURE_COUNT = OrmV2_0Package.XML_QUERY_20_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -4456,22 +5012,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_NAMED_NATIVE_QUERY__NAME = XML_QUERY__NAME;
/**
- * The feature id for the '<em><b>Query</b></em>' attribute.
+ * The feature id for the '<em><b>Hints</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_NAMED_NATIVE_QUERY__QUERY = XML_QUERY__QUERY;
+ public static final int XML_NAMED_NATIVE_QUERY__HINTS = XML_QUERY__HINTS;
/**
- * The feature id for the '<em><b>Hints</b></em>' containment reference list.
+ * The feature id for the '<em><b>Query</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_NAMED_NATIVE_QUERY__HINTS = XML_QUERY__HINTS;
+ public static final int XML_NAMED_NATIVE_QUERY__QUERY = XML_QUERY_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Result Class</b></em>' attribute.
@@ -4480,7 +5036,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_NATIVE_QUERY__RESULT_CLASS = XML_QUERY_FEATURE_COUNT + 0;
+ public static final int XML_NAMED_NATIVE_QUERY__RESULT_CLASS = XML_QUERY_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Result Set Mapping</b></em>' attribute.
@@ -4489,7 +5045,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING = XML_QUERY_FEATURE_COUNT + 1;
+ public static final int XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING = XML_QUERY_FEATURE_COUNT + 2;
/**
* The number of structural features of the '<em>Xml Named Native Query</em>' class.
@@ -4498,7 +5054,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_NATIVE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 2;
+ public static final int XML_NAMED_NATIVE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -4519,13 +5075,68 @@ public class OrmPackage extends EPackageImpl
public static final int XML_NAMED_QUERY__NAME = XML_QUERY__NAME;
/**
+ * The feature id for the '<em><b>Hints</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_QUERY__HINTS = XML_QUERY__HINTS;
+
+ /**
+ * The feature id for the '<em><b>Lock Mode</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_QUERY__LOCK_MODE = XML_QUERY_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Query</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_NAMED_QUERY__QUERY = XML_QUERY__QUERY;
+ public static final int XML_NAMED_QUERY__QUERY = XML_QUERY_FEATURE_COUNT + 1;
+
+ /**
+ * The number of structural features of the '<em>Xml Named Query</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery()
+ * @generated
+ */
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 69;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = XML_QUERY__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = XML_QUERY__NAME;
/**
* The feature id for the '<em><b>Hints</b></em>' containment reference list.
@@ -4534,25 +5145,62 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_QUERY__HINTS = XML_QUERY__HINTS;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = XML_QUERY__HINTS;
/**
- * The feature id for the '<em><b>Lock Mode</b></em>' attribute.
+ * The feature id for the '<em><b>Result Classes</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_NAMED_QUERY__LOCK_MODE = XML_QUERY_FEATURE_COUNT + 0;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = XML_QUERY_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>Xml Named Query</em>' class.
+ * The feature id for the '<em><b>Result Set Mappings</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = XML_QUERY_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Procedure Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = XML_QUERY_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_NAMED_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 1;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = XML_QUERY_FEATURE_COUNT + 3;
+
+ /**
+ * The number of structural features of the '<em>Xml Named Stored Procedure Query</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 4;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter()
+ * @generated
+ */
+ public static final int XML_STORED_PROCEDURE_PARAMETER = 94;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -4744,13 +5392,40 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ONE_TO_MANY__ORPHAN_REMOVAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
/**
+ * The feature id for the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERTS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Map Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_MANY__FOREIGN_KEY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
+
+ /**
* The number of structural features of the '<em>Xml One To Many</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_ONE_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -4870,13 +5545,40 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ONE_TO_ONE__ORPHAN_REMOVAL = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
/**
+ * The feature id for the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_ONE__MAP_KEY_CONVERTS = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_ONE__FOREIGN_KEY = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
+
+ /**
* The number of structural features of the '<em>Xml One To One</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_ONE_FEATURE_COUNT = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_ONE_TO_ONE_FEATURE_COUNT = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
@@ -4886,7 +5588,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryHint()
* @generated
*/
- public static final int XML_QUERY_HINT = 82;
+ public static final int XML_QUERY_HINT = 90;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
@@ -4896,7 +5598,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSecondaryTable()
* @generated
*/
- public static final int XML_SECONDARY_TABLE = 83;
+ public static final int XML_SECONDARY_TABLE = 91;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
@@ -4906,17 +5608,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
* @generated
*/
- public static final int XML_SEQUENCE_GENERATOR = 84;
-
- /**
- * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getSqlResultSetMapping()
- * @generated
- */
- public static final int SQL_RESULT_SET_MAPPING = 85;
+ public static final int XML_SEQUENCE_GENERATOR = 92;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
@@ -4926,7 +5618,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTable()
* @generated
*/
- public static final int XML_TABLE = 86;
+ public static final int XML_TABLE = 95;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
@@ -4936,7 +5628,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTableGenerator()
* @generated
*/
- public static final int XML_TABLE_GENERATOR = 87;
+ public static final int XML_TABLE_GENERATOR = 96;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
@@ -4946,7 +5638,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTransient()
* @generated
*/
- public static final int XML_TRANSIENT = 88;
+ public static final int XML_TRANSIENT = 97;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
@@ -4956,7 +5648,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
* @generated
*/
- public static final int XML_UNIQUE_CONSTRAINT = 90;
+ public static final int XML_UNIQUE_CONSTRAINT = 99;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
@@ -4966,7 +5658,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlVersion()
* @generated
*/
- public static final int XML_VERSION = 91;
+ public static final int XML_VERSION = 100;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class.
@@ -4976,7 +5668,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOrderable()
* @generated
*/
- public static final int XML_ORDERABLE = 65;
+ public static final int XML_ORDERABLE = 73;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -5418,7 +6110,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnContainer()
* @generated
*/
- public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER = 79;
+ public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER = 87;
/**
* The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
@@ -5439,13 +6131,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER_FEATURE_COUNT = 1;
/**
+ * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES = OrmV2_1Package.XML_QUERY_CONTAINER_21__NAMED_STORED_PROCEDURE_QUERIES;
+
+ /**
* The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_QUERY_CONTAINER__NAMED_QUERIES = 0;
+ public static final int XML_QUERY_CONTAINER__NAMED_QUERIES = OrmV2_1Package.XML_QUERY_CONTAINER_21_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
@@ -5454,7 +6155,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_QUERY_CONTAINER__NAMED_NATIVE_QUERIES = 1;
+ public static final int XML_QUERY_CONTAINER__NAMED_NATIVE_QUERIES = OrmV2_1Package.XML_QUERY_CONTAINER_21_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Xml Query Container</em>' class.
@@ -5463,7 +6164,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_QUERY_CONTAINER_FEATURE_COUNT = 2;
+ public static final int XML_QUERY_CONTAINER_FEATURE_COUNT = OrmV2_1Package.XML_QUERY_CONTAINER_21_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -5538,13 +6239,31 @@ public class OrmPackage extends EPackageImpl
public static final int XML_SECONDARY_TABLE__UNIQUE_CONSTRAINTS = ABSTRACT_XML_TABLE__UNIQUE_CONSTRAINTS;
/**
+ * The feature id for the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY = ABSTRACT_XML_TABLE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_SECONDARY_TABLE__INDEXES = ABSTRACT_XML_TABLE_FEATURE_COUNT + 1;
+
+ /**
* The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS = ABSTRACT_XML_TABLE_FEATURE_COUNT + 0;
+ public static final int XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS = ABSTRACT_XML_TABLE_FEATURE_COUNT + 2;
/**
* The number of structural features of the '<em>Xml Secondary Table</em>' class.
@@ -5553,7 +6272,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_SECONDARY_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 1;
+ public static final int XML_SECONDARY_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -5628,13 +6347,32 @@ public class OrmPackage extends EPackageImpl
public static final int XML_SEQUENCE_GENERATOR_FEATURE_COUNT = XML_GENERATOR_FEATURE_COUNT + 3;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping <em>Xml Sql Result Set Mapping</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping()
+ * @generated
+ */
+ public static final int XML_SQL_RESULT_SET_MAPPING = 93;
+
+ /**
* The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int SQL_RESULT_SET_MAPPING__DESCRIPTION = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20__DESCRIPTION;
+ public static final int XML_SQL_RESULT_SET_MAPPING__DESCRIPTION = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Constructor Results</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -5643,7 +6381,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int SQL_RESULT_SET_MAPPING__NAME = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 0;
+ public static final int XML_SQL_RESULT_SET_MAPPING__NAME = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Entity Results</b></em>' containment reference list.
@@ -5652,7 +6390,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int SQL_RESULT_SET_MAPPING__ENTITY_RESULTS = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 1;
+ public static final int XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Column Results</b></em>' containment reference list.
@@ -5661,16 +6399,61 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 2;
+ public static final int XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 3;
+
+ /**
+ * The number of structural features of the '<em>Xml Sql Result Set Mapping</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_SQL_RESULT_SET_MAPPING_FEATURE_COUNT = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION;
+
+ /**
+ * The feature id for the '<em><b>Parameter Mode</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_STORED_PROCEDURE_PARAMETER__NAME = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__NAME;
+
+ /**
+ * The feature id for the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__CLASS_NAME;
/**
- * The number of structural features of the '<em>Sql Result Set Mapping</em>' class.
+ * The number of structural features of the '<em>Xml Stored Procedure Parameter</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int SQL_RESULT_SET_MAPPING_FEATURE_COUNT = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 3;
+ public static final int XML_STORED_PROCEDURE_PARAMETER_FEATURE_COUNT = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -5709,13 +6492,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_TABLE__UNIQUE_CONSTRAINTS = ABSTRACT_XML_TABLE__UNIQUE_CONSTRAINTS;
/**
+ * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_TABLE__INDEXES = ABSTRACT_XML_TABLE_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Xml Table</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 0;
+ public static final int XML_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -5754,13 +6546,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_TABLE_GENERATOR__ALLOCATION_SIZE = XML_GENERATOR__ALLOCATION_SIZE;
/**
+ * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_TABLE_GENERATOR__INDEXES = XML_GENERATOR_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Table</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__TABLE = XML_GENERATOR_FEATURE_COUNT + 0;
+ public static final int XML_TABLE_GENERATOR__TABLE = XML_GENERATOR_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Catalog</b></em>' attribute.
@@ -5769,7 +6570,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__CATALOG = XML_GENERATOR_FEATURE_COUNT + 1;
+ public static final int XML_TABLE_GENERATOR__CATALOG = XML_GENERATOR_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Schema</b></em>' attribute.
@@ -5778,7 +6579,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__SCHEMA = XML_GENERATOR_FEATURE_COUNT + 2;
+ public static final int XML_TABLE_GENERATOR__SCHEMA = XML_GENERATOR_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Pk Column Name</b></em>' attribute.
@@ -5787,7 +6588,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__PK_COLUMN_NAME = XML_GENERATOR_FEATURE_COUNT + 3;
+ public static final int XML_TABLE_GENERATOR__PK_COLUMN_NAME = XML_GENERATOR_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Value Column Name</b></em>' attribute.
@@ -5796,7 +6597,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__VALUE_COLUMN_NAME = XML_GENERATOR_FEATURE_COUNT + 4;
+ public static final int XML_TABLE_GENERATOR__VALUE_COLUMN_NAME = XML_GENERATOR_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Pk Column Value</b></em>' attribute.
@@ -5805,7 +6606,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__PK_COLUMN_VALUE = XML_GENERATOR_FEATURE_COUNT + 5;
+ public static final int XML_TABLE_GENERATOR__PK_COLUMN_VALUE = XML_GENERATOR_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
@@ -5814,7 +6615,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS = XML_GENERATOR_FEATURE_COUNT + 6;
+ public static final int XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS = XML_GENERATOR_FEATURE_COUNT + 7;
/**
* The number of structural features of the '<em>Xml Table Generator</em>' class.
@@ -5823,7 +6624,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = XML_GENERATOR_FEATURE_COUNT + 7;
+ public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = XML_GENERATOR_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -5907,13 +6708,22 @@ public class OrmPackage extends EPackageImpl
public static final int XML_VERSION__COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_VERSION__CONVERT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+
+ /**
* The feature id for the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_VERSION__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_VERSION__LOB = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Temporal</b></em>' attribute.
@@ -5922,7 +6732,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_VERSION__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_VERSION__TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Enumerated</b></em>' attribute.
@@ -5931,7 +6741,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_VERSION__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_VERSION__ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
* The number of structural features of the '<em>Xml Version</em>' class.
@@ -5940,7 +6750,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_VERSION_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_VERSION_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum.
@@ -5950,7 +6760,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getDiscriminatorType()
* @generated
*/
- public static final int DISCRIMINATOR_TYPE = 92;
+ public static final int DISCRIMINATOR_TYPE = 101;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EnumType <em>Enum Type</em>}' enum.
@@ -5960,7 +6770,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEnumType()
* @generated
*/
- public static final int ENUM_TYPE = 93;
+ public static final int ENUM_TYPE = 102;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.FetchType <em>Fetch Type</em>}' enum.
@@ -5970,7 +6780,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFetchType()
* @generated
*/
- public static final int FETCH_TYPE = 94;
+ public static final int FETCH_TYPE = 103;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.GenerationType <em>Generation Type</em>}' enum.
@@ -5980,7 +6790,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getGenerationType()
* @generated
*/
- public static final int GENERATION_TYPE = 95;
+ public static final int GENERATION_TYPE = 104;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum.
@@ -5990,7 +6800,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritanceType()
* @generated
*/
- public static final int INHERITANCE_TYPE = 96;
+ public static final int INHERITANCE_TYPE = 105;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum.
@@ -6000,7 +6810,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getTemporalType()
* @generated
*/
- public static final int TEMPORAL_TYPE = 97;
+ public static final int TEMPORAL_TYPE = 106;
/**
* <!-- begin-user-doc -->
@@ -6203,6 +7013,20 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass constructorResultEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlConvertEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlConverterEClass = null;
/**
@@ -6308,6 +7132,13 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlForeignKeyEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlGeneratedValueEClass = null;
/**
@@ -6343,6 +7174,13 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlIndexEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass inheritanceEClass = null;
/**
@@ -6420,6 +7258,27 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlNamedAttributeNodeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlNamedEntityGraphEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlNamedSubgraphEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlNamedNativeQueryEClass = null;
/**
@@ -6434,6 +7293,20 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlNamedStoredProcedureQueryEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass xmlStoredProcedureParameterEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlNullAttributeMappingEClass = null;
/**
@@ -6595,7 +7468,7 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- private EClass sqlResultSetMappingEClass = null;
+ private EClass xmlSqlResultSetMappingEClass = null;
/**
* <!-- begin-user-doc -->
@@ -7812,6 +8685,34 @@ public class OrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult <em>Constructor Result</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Constructor Result</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult
+ * @generated
+ */
+ public EClass getConstructorResult()
+ {
+ return constructorResultEClass;
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert <em>Xml Convert</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Convert</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlConvert
+ * @generated
+ */
+ public EClass getXmlConvert()
+ {
+ return xmlConvertEClass;
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter <em>Xml Converter</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -8568,6 +9469,20 @@ public class OrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey <em>Xml Foreign Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Foreign Key</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey
+ * @generated
+ */
+ public EClass getXmlForeignKey()
+ {
+ return xmlForeignKeyEClass;
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -8761,6 +9676,20 @@ public class OrmPackage extends EPackageImpl
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex <em>Xml Index</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Index</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlIndex
+ * @generated
+ */
+ public EClass getXmlIndex()
+ {
+ return xmlIndexEClass;
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.Inheritance <em>Inheritance</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9034,6 +9963,48 @@ public class OrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode <em>Xml Named Attribute Node</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Named Attribute Node</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode
+ * @generated
+ */
+ public EClass getXmlNamedAttributeNode()
+ {
+ return xmlNamedAttributeNodeEClass;
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph <em>Xml Named Entity Graph</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Named Entity Graph</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph
+ * @generated
+ */
+ public EClass getXmlNamedEntityGraph()
+ {
+ return xmlNamedEntityGraphEClass;
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph <em>Xml Named Subgraph</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Named Subgraph</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph
+ * @generated
+ */
+ public EClass getXmlNamedSubgraph()
+ {
+ return xmlNamedSubgraphEClass;
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9047,6 +10018,21 @@ public class OrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery#getQuery <em>Query</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Query</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery#getQuery()
+ * @see #getXmlNamedNativeQuery()
+ * @generated
+ */
+ public EAttribute getXmlNamedNativeQuery_Query()
+ {
+ return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(0);
+ }
+
+
+ /**
* Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery#getResultClass <em>Result Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9057,7 +10043,7 @@ public class OrmPackage extends EPackageImpl
*/
public EAttribute getXmlNamedNativeQuery_ResultClass()
{
- return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(1);
}
/**
@@ -9071,7 +10057,7 @@ public class OrmPackage extends EPackageImpl
*/
public EAttribute getXmlNamedNativeQuery_ResultSetMapping()
{
- return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)xmlNamedNativeQueryEClass.getEStructuralFeatures().get(2);
}
/**
@@ -9088,6 +10074,49 @@ public class OrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery#getQuery <em>Query</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Query</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery#getQuery()
+ * @see #getXmlNamedQuery()
+ * @generated
+ */
+ public EAttribute getXmlNamedQuery_Query()
+ {
+ return (EAttribute)xmlNamedQueryEClass.getEStructuralFeatures().get(0);
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Named Stored Procedure Query</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery
+ * @generated
+ */
+ public EClass getXmlNamedStoredProcedureQuery()
+ {
+ return xmlNamedStoredProcedureQueryEClass;
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Stored Procedure Parameter</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter
+ * @generated
+ */
+ public EClass getXmlStoredProcedureParameter()
+ {
+ return xmlStoredProcedureParameterEClass;
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9482,20 +10511,6 @@ public class OrmPackage extends EPackageImpl
}
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getQuery <em>Query</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Query</em>'.
- * @see org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getQuery()
- * @see #getXmlQuery()
- * @generated
- */
- public EAttribute getXmlQuery_Query()
- {
- return (EAttribute)xmlQueryEClass.getEStructuralFeatures().get(1);
- }
-
- /**
* Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getHints <em>Hints</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9506,7 +10521,7 @@ public class OrmPackage extends EPackageImpl
*/
public EReference getXmlQuery_Hints()
{
- return (EReference)xmlQueryEClass.getEStructuralFeatures().get(2);
+ return (EReference)xmlQueryEClass.getEStructuralFeatures().get(1);
}
/**
@@ -9646,60 +10661,64 @@ public class OrmPackage extends EPackageImpl
}
/**
- * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping <em>Xml Sql Result Set Mapping</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Sql Result Set Mapping</em>'.
- * @see org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping
+ * @return the meta object for class '<em>Xml Sql Result Set Mapping</em>'.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping
* @generated
*/
- public EClass getSqlResultSetMapping()
+ public EClass getXmlSqlResultSetMapping()
{
- return sqlResultSetMappingEClass;
+ return xmlSqlResultSetMappingEClass;
}
+
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getName <em>Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getName()
- * @see #getSqlResultSetMapping()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getName()
+ * @see #getXmlSqlResultSetMapping()
* @generated
*/
- public EAttribute getSqlResultSetMapping_Name()
+ public EAttribute getXmlSqlResultSetMapping_Name()
{
- return (EAttribute)sqlResultSetMappingEClass.getEStructuralFeatures().get(0);
+ return (EAttribute)xmlSqlResultSetMappingEClass.getEStructuralFeatures().get(0);
}
+
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getEntityResults <em>Entity Results</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Entity Results</em>'.
- * @see org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getEntityResults()
- * @see #getSqlResultSetMapping()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getEntityResults()
+ * @see #getXmlSqlResultSetMapping()
* @generated
*/
- public EReference getSqlResultSetMapping_EntityResults()
+ public EReference getXmlSqlResultSetMapping_EntityResults()
{
- return (EReference)sqlResultSetMappingEClass.getEStructuralFeatures().get(1);
+ return (EReference)xmlSqlResultSetMappingEClass.getEStructuralFeatures().get(1);
}
+
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getColumnResults <em>Column Results</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Column Results</em>'.
- * @see org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getColumnResults()
- * @see #getSqlResultSetMapping()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getColumnResults()
+ * @see #getXmlSqlResultSetMapping()
* @generated
*/
- public EReference getSqlResultSetMapping_ColumnResults()
+ public EReference getXmlSqlResultSetMapping_ColumnResults()
{
- return (EReference)sqlResultSetMappingEClass.getEStructuralFeatures().get(2);
+ return (EReference)xmlSqlResultSetMappingEClass.getEStructuralFeatures().get(2);
}
+
/**
* Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTable <em>Xml Table</em>}'.
* <!-- begin-user-doc -->
@@ -10190,6 +11209,10 @@ public class OrmPackage extends EPackageImpl
columnResultEClass = createEClass(COLUMN_RESULT);
createEAttribute(columnResultEClass, COLUMN_RESULT__NAME);
+ constructorResultEClass = createEClass(CONSTRUCTOR_RESULT);
+
+ xmlConvertEClass = createEClass(XML_CONVERT);
+
xmlConverterEClass = createEClass(XML_CONVERTER);
xmlConvertibleMappingEClass = createEClass(XML_CONVERTIBLE_MAPPING);
@@ -10260,6 +11283,8 @@ public class OrmPackage extends EPackageImpl
createEAttribute(fieldResultEClass, FIELD_RESULT__NAME);
createEAttribute(fieldResultEClass, FIELD_RESULT__COLUMN);
+ xmlForeignKeyEClass = createEClass(XML_FOREIGN_KEY);
+
xmlGeneratedValueEClass = createEClass(XML_GENERATED_VALUE);
createEAttribute(xmlGeneratedValueEClass, XML_GENERATED_VALUE__GENERATOR);
createEAttribute(xmlGeneratedValueEClass, XML_GENERATED_VALUE__STRATEGY);
@@ -10279,6 +11304,8 @@ public class OrmPackage extends EPackageImpl
xmlIdClassContainerEClass = createEClass(XML_ID_CLASS_CONTAINER);
createEReference(xmlIdClassContainerEClass, XML_ID_CLASS_CONTAINER__ID_CLASS);
+ xmlIndexEClass = createEClass(XML_INDEX);
+
inheritanceEClass = createEClass(INHERITANCE);
createEAttribute(inheritanceEClass, INHERITANCE__STRATEGY);
@@ -10310,11 +11337,21 @@ public class OrmPackage extends EPackageImpl
createEAttribute(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS);
createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS);
+ xmlNamedAttributeNodeEClass = createEClass(XML_NAMED_ATTRIBUTE_NODE);
+
+ xmlNamedEntityGraphEClass = createEClass(XML_NAMED_ENTITY_GRAPH);
+
+ xmlNamedSubgraphEClass = createEClass(XML_NAMED_SUBGRAPH);
+
xmlNamedNativeQueryEClass = createEClass(XML_NAMED_NATIVE_QUERY);
+ createEAttribute(xmlNamedNativeQueryEClass, XML_NAMED_NATIVE_QUERY__QUERY);
createEAttribute(xmlNamedNativeQueryEClass, XML_NAMED_NATIVE_QUERY__RESULT_CLASS);
createEAttribute(xmlNamedNativeQueryEClass, XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING);
xmlNamedQueryEClass = createEClass(XML_NAMED_QUERY);
+ createEAttribute(xmlNamedQueryEClass, XML_NAMED_QUERY__QUERY);
+
+ xmlNamedStoredProcedureQueryEClass = createEClass(XML_NAMED_STORED_PROCEDURE_QUERY);
xmlNullAttributeMappingEClass = createEClass(XML_NULL_ATTRIBUTE_MAPPING);
@@ -10364,7 +11401,6 @@ public class OrmPackage extends EPackageImpl
xmlQueryEClass = createEClass(XML_QUERY);
createEAttribute(xmlQueryEClass, XML_QUERY__NAME);
- createEAttribute(xmlQueryEClass, XML_QUERY__QUERY);
createEReference(xmlQueryEClass, XML_QUERY__HINTS);
xmlQueryContainerEClass = createEClass(XML_QUERY_CONTAINER);
@@ -10381,10 +11417,12 @@ public class OrmPackage extends EPackageImpl
xmlSequenceGeneratorEClass = createEClass(XML_SEQUENCE_GENERATOR);
createEAttribute(xmlSequenceGeneratorEClass, XML_SEQUENCE_GENERATOR__SEQUENCE_NAME);
- sqlResultSetMappingEClass = createEClass(SQL_RESULT_SET_MAPPING);
- createEAttribute(sqlResultSetMappingEClass, SQL_RESULT_SET_MAPPING__NAME);
- createEReference(sqlResultSetMappingEClass, SQL_RESULT_SET_MAPPING__ENTITY_RESULTS);
- createEReference(sqlResultSetMappingEClass, SQL_RESULT_SET_MAPPING__COLUMN_RESULTS);
+ xmlSqlResultSetMappingEClass = createEClass(XML_SQL_RESULT_SET_MAPPING);
+ createEAttribute(xmlSqlResultSetMappingEClass, XML_SQL_RESULT_SET_MAPPING__NAME);
+ createEReference(xmlSqlResultSetMappingEClass, XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS);
+ createEReference(xmlSqlResultSetMappingEClass, XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS);
+
+ xmlStoredProcedureParameterEClass = createEClass(XML_STORED_PROCEDURE_PARAMETER);
xmlTableEClass = createEClass(XML_TABLE);
@@ -10486,6 +11524,7 @@ public class OrmPackage extends EPackageImpl
xmlAssociationOverrideEClass.getESuperTypes().add(this.getXmlOverride());
xmlAssociationOverrideEClass.getESuperTypes().add(this.getXmlJoinColumnContainer());
xmlAssociationOverrideEClass.getESuperTypes().add(theOrmV2_0Package.getXmlAssociationOverride_2_0());
+ xmlAssociationOverrideEClass.getESuperTypes().add(theOrmV2_1Package.getXmlAssociationOverride_2_1());
xmlAttributeOverrideEClass.getESuperTypes().add(this.getXmlOverride());
xmlAttributeOverrideEClass.getESuperTypes().add(theOrmV2_0Package.getXmlAttributeOverride_2_0());
attributesEClass.getESuperTypes().add(theOrmV2_0Package.getXmlAttributes_2_0());
@@ -10495,14 +11534,21 @@ public class OrmPackage extends EPackageImpl
cascadeTypeEClass.getESuperTypes().add(theOrmV2_0Package.getXmlCascadeType_2_0());
xmlCollectionTableEClass.getESuperTypes().add(this.getAbstractXmlReferenceTable());
xmlCollectionTableEClass.getESuperTypes().add(theOrmV2_0Package.getXmlCollectionTable_2_0());
+ xmlCollectionTableEClass.getESuperTypes().add(theOrmV2_1Package.getXmlCollectionTable_2_1());
xmlColumnEClass.getESuperTypes().add(this.getAbstractXmlBaseColumn());
+ columnResultEClass.getESuperTypes().add(theOrmV2_1Package.getColumnResult_2_1());
+ constructorResultEClass.getESuperTypes().add(theOrmV2_1Package.getConstructorResult_2_1());
+ xmlConvertEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConvert_2_1());
xmlConverterEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConverter_2_1());
+ xmlConvertibleMappingEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConvertibleMapping_2_1());
xmlDiscriminatorColumnEClass.getESuperTypes().add(this.getAbstractXmlBaseDiscriminatorColumn());
xmlElementCollectionEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlElementCollectionEClass.getESuperTypes().add(theOrmV2_0Package.getXmlElementCollection_2_0());
+ xmlElementCollectionEClass.getESuperTypes().add(theOrmV2_1Package.getXmlElementCollection_2_1());
xmlEmbeddableEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping());
xmlEmbeddedEClass.getESuperTypes().add(this.getAbstractXmlEmbedded());
xmlEmbeddedEClass.getESuperTypes().add(theOrmV2_0Package.getXmlEmbedded_2_0());
+ xmlEmbeddedEClass.getESuperTypes().add(theOrmV2_1Package.getXmlEmbedded_2_1());
xmlEmbeddedIdEClass.getESuperTypes().add(this.getAbstractXmlEmbedded());
xmlEntityEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping());
xmlEntityEClass.getESuperTypes().add(this.getXmlQueryContainer());
@@ -10512,6 +11558,7 @@ public class OrmPackage extends EPackageImpl
xmlEntityEClass.getESuperTypes().add(this.getXmlAssociationOverrideContainer());
xmlEntityEClass.getESuperTypes().add(theOrmV2_0Package.getXmlEntity_2_0());
xmlEntityEClass.getESuperTypes().add(this.getXmlIdClassContainer());
+ xmlEntityEClass.getESuperTypes().add(theOrmV2_1Package.getXmlEntity_2_1());
entityListenerEClass.getESuperTypes().add(this.getXmlEventMethodContainer());
entityListenerEClass.getESuperTypes().add(theOrmV2_0Package.getXmlEntityListener_2_0());
xmlEntityMappingsEClass.getESuperTypes().add(theCommonPackage.getERootObjectImpl());
@@ -10519,30 +11566,42 @@ public class OrmPackage extends EPackageImpl
xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlAccessHolder());
xmlEntityMappingsEClass.getESuperTypes().add(theOrmV2_1Package.getXmlEntityMappings_2_1());
eventMethodEClass.getESuperTypes().add(theOrmV2_0Package.getXmlEventMethod_2_0());
+ xmlForeignKeyEClass.getESuperTypes().add(theOrmV2_1Package.getXmlForeignKey_2_1());
xmlGeneratorEClass.getESuperTypes().add(theOrmV2_0Package.getXmlGenerator_2_0());
xmlIdEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlIdEClass.getESuperTypes().add(this.getColumnMapping());
xmlIdEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
xmlIdEClass.getESuperTypes().add(this.getXmlGeneratorContainer());
+ xmlIndexEClass.getESuperTypes().add(theOrmV2_1Package.getXmlIndex_2_1());
xmlJoinColumnEClass.getESuperTypes().add(this.getAbstractXmlBaseColumn());
xmlJoinColumnEClass.getESuperTypes().add(this.getXmlBaseJoinColumn());
xmlJoinTableEClass.getESuperTypes().add(this.getAbstractXmlReferenceTable());
+ xmlJoinTableEClass.getESuperTypes().add(theOrmV2_1Package.getXmlJoinTable_2_1());
xmlManyToManyEClass.getESuperTypes().add(this.getAbstractXmlMultiRelationshipMapping());
xmlManyToManyEClass.getESuperTypes().add(theOrmV2_0Package.getXmlManyToMany_2_0());
+ xmlManyToManyEClass.getESuperTypes().add(theOrmV2_1Package.getXmlManyToMany_2_1());
xmlManyToOneEClass.getESuperTypes().add(this.getAbstractXmlSingleRelationshipMapping());
+ xmlManyToOneEClass.getESuperTypes().add(theOrmV2_1Package.getXmlManyToOne_2_1());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping());
xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlIdClassContainer());
+ xmlNamedAttributeNodeEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedAttributeNode_2_1());
+ xmlNamedEntityGraphEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedEntityGraph_2_1());
+ xmlNamedSubgraphEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedSubgraph_2_1());
xmlNamedNativeQueryEClass.getESuperTypes().add(this.getXmlQuery());
xmlNamedQueryEClass.getESuperTypes().add(this.getXmlQuery());
xmlNamedQueryEClass.getESuperTypes().add(theOrmV2_0Package.getXmlNamedQuery_2_0());
+ xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(this.getXmlQuery());
+ xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedStoredProcedureQuery_2_1());
xmlNullAttributeMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlOneToManyEClass.getESuperTypes().add(this.getAbstractXmlMultiRelationshipMapping());
xmlOneToManyEClass.getESuperTypes().add(this.getXmlJoinColumnContainer());
xmlOneToManyEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOneToMany_2_0());
+ xmlOneToManyEClass.getESuperTypes().add(theOrmV2_1Package.getXmlOneToMany_2_1());
xmlOneToOneEClass.getESuperTypes().add(this.getAbstractXmlSingleRelationshipMapping());
xmlOneToOneEClass.getESuperTypes().add(this.getXmlMappedByMapping());
xmlOneToOneEClass.getESuperTypes().add(this.getXmlPrimaryKeyJoinColumnContainer());
xmlOneToOneEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOneToOne_2_0());
+ xmlOneToOneEClass.getESuperTypes().add(theOrmV2_1Package.getXmlOneToOne_2_1());
xmlOrderableEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOrderable_2_0());
xmlOrderColumnEClass.getESuperTypes().add(this.getAbstractXmlNamedColumn());
xmlOrderColumnEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOrderColumn_2_0());
@@ -10559,13 +11618,19 @@ public class OrmPackage extends EPackageImpl
xmlPrimaryKeyJoinColumnEClass.getESuperTypes().add(this.getAbstractXmlNamedColumn());
xmlPrimaryKeyJoinColumnEClass.getESuperTypes().add(this.getXmlBaseJoinColumn());
xmlQueryEClass.getESuperTypes().add(theOrmV2_0Package.getXmlQuery_2_0());
+ xmlQueryContainerEClass.getESuperTypes().add(theOrmV2_1Package.getXmlQueryContainer_2_1());
xmlQueryHintEClass.getESuperTypes().add(theOrmV2_0Package.getXmlQueryHint_2_0());
xmlSecondaryTableEClass.getESuperTypes().add(this.getAbstractXmlTable());
+ xmlSecondaryTableEClass.getESuperTypes().add(theOrmV2_1Package.getXmlSecondaryTable_2_1());
xmlSequenceGeneratorEClass.getESuperTypes().add(this.getXmlGenerator());
xmlSequenceGeneratorEClass.getESuperTypes().add(theOrmV2_0Package.getXmlSequenceGenerator_2_0());
- sqlResultSetMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlSqlResultSetMapping_2_0());
+ xmlSqlResultSetMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlSqlResultSetMapping_2_0());
+ xmlSqlResultSetMappingEClass.getESuperTypes().add(theOrmV2_1Package.getXmlSqlResultSetMapping_2_1());
+ xmlStoredProcedureParameterEClass.getESuperTypes().add(theOrmV2_1Package.getXmlStoredProcedureParameter_2_1());
xmlTableEClass.getESuperTypes().add(this.getAbstractXmlTable());
+ xmlTableEClass.getESuperTypes().add(theOrmV2_1Package.getXmlTable_2_1());
xmlTableGeneratorEClass.getESuperTypes().add(this.getXmlGenerator());
+ xmlTableGeneratorEClass.getESuperTypes().add(theOrmV2_1Package.getXmlTableGenerator_2_1());
xmlTransientEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlTypeMappingEClass.getESuperTypes().add(this.getXmlAccessHolder());
xmlUniqueConstraintEClass.getESuperTypes().add(theOrmV2_0Package.getXmlUniqueConstraint_2_0());
@@ -10679,6 +11744,10 @@ public class OrmPackage extends EPackageImpl
initEClass(columnResultEClass, ColumnResult.class, "ColumnResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getColumnResult_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, ColumnResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(constructorResultEClass, ConstructorResult.class, "ConstructorResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(xmlConvertEClass, XmlConvert.class, "XmlConvert", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(xmlConverterEClass, XmlConverter.class, "XmlConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlConvertibleMappingEClass, XmlConvertibleMapping.class, "XmlConvertibleMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -10704,7 +11773,7 @@ public class OrmPackage extends EPackageImpl
initEReference(getXmlEntity_Inheritance(), this.getInheritance(), null, "inheritance", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlEntity_DiscriminatorValue(), theXMLTypePackage.getString(), "discriminatorValue", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_DiscriminatorColumn(), this.getXmlDiscriminatorColumn(), null, "discriminatorColumn", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_SqlResultSetMappings(), this.getXmlSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlEntity_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlEntity_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -10723,7 +11792,7 @@ public class OrmPackage extends EPackageImpl
initEAttribute(getXmlEntityMappings_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_SequenceGenerators(), this.getXmlSequenceGenerator(), null, "sequenceGenerators", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_TableGenerators(), this.getXmlTableGenerator(), null, "tableGenerators", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_SqlResultSetMappings(), this.getXmlSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_MappedSuperclasses(), this.getXmlMappedSuperclass(), null, "mappedSuperclasses", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_Entities(), this.getXmlEntity(), null, "entities", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_Embeddables(), this.getXmlEmbeddable(), null, "embeddables", null, 0, -1, XmlEntityMappings.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -10749,6 +11818,8 @@ public class OrmPackage extends EPackageImpl
initEAttribute(getFieldResult_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, FieldResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getFieldResult_Column(), theXMLTypePackage.getString(), "column", null, 1, 1, FieldResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlForeignKeyEClass, XmlForeignKey.class, "XmlForeignKey", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(xmlGeneratedValueEClass, XmlGeneratedValue.class, "XmlGeneratedValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlGeneratedValue_Generator(), theXMLTypePackage.getString(), "generator", null, 0, 1, XmlGeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlGeneratedValue_Strategy(), this.getGenerationType(), "strategy", "TABLE", 0, 1, XmlGeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -10768,6 +11839,8 @@ public class OrmPackage extends EPackageImpl
initEClass(xmlIdClassContainerEClass, XmlIdClassContainer.class, "XmlIdClassContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlIdClassContainer_IdClass(), this.getXmlClassReference(), null, "idClass", null, 0, 1, XmlIdClassContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlIndexEClass, XmlIndex.class, "XmlIndex", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(inheritanceEClass, Inheritance.class, "Inheritance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getInheritance_Strategy(), this.getInheritanceType(), "strategy", "SINGLE_TABLE", 0, 1, Inheritance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -10799,11 +11872,21 @@ public class OrmPackage extends EPackageImpl
initEAttribute(getXmlMappedSuperclass_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlMappedSuperclass_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlNamedAttributeNodeEClass, XmlNamedAttributeNode.class, "XmlNamedAttributeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(xmlNamedEntityGraphEClass, XmlNamedEntityGraph.class, "XmlNamedEntityGraph", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(xmlNamedSubgraphEClass, XmlNamedSubgraph.class, "XmlNamedSubgraph", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(xmlNamedNativeQueryEClass, XmlNamedNativeQuery.class, "XmlNamedNativeQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlNamedNativeQuery_Query(), theXMLTypePackage.getString(), "query", null, 1, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedNativeQuery_ResultClass(), theXMLTypePackage.getString(), "resultClass", null, 0, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedNativeQuery_ResultSetMapping(), theXMLTypePackage.getString(), "resultSetMapping", null, 0, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlNamedQueryEClass, XmlNamedQuery.class, "XmlNamedQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlNamedQuery_Query(), theXMLTypePackage.getString(), "query", null, 1, 1, XmlNamedQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlNamedStoredProcedureQueryEClass, XmlNamedStoredProcedureQuery.class, "XmlNamedStoredProcedureQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlNullAttributeMappingEClass, XmlNullAttributeMapping.class, "XmlNullAttributeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -10853,7 +11936,6 @@ public class OrmPackage extends EPackageImpl
initEClass(xmlQueryEClass, XmlQuery.class, "XmlQuery", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlQuery_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getXmlQuery_Query(), theXMLTypePackage.getString(), "query", null, 1, 1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlQuery_Hints(), this.getXmlQueryHint(), null, "hints", null, 0, -1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlQueryContainerEClass, XmlQueryContainer.class, "XmlQueryContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -10870,10 +11952,12 @@ public class OrmPackage extends EPackageImpl
initEClass(xmlSequenceGeneratorEClass, XmlSequenceGenerator.class, "XmlSequenceGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlSequenceGenerator_SequenceName(), theXMLTypePackage.getString(), "sequenceName", null, 0, 1, XmlSequenceGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(sqlResultSetMappingEClass, SqlResultSetMapping.class, "SqlResultSetMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSqlResultSetMapping_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getSqlResultSetMapping_EntityResults(), this.getEntityResult(), null, "entityResults", null, 0, -1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getSqlResultSetMapping_ColumnResults(), this.getColumnResult(), null, "columnResults", null, 0, -1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlSqlResultSetMappingEClass, XmlSqlResultSetMapping.class, "XmlSqlResultSetMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlSqlResultSetMapping_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlSqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlSqlResultSetMapping_EntityResults(), this.getEntityResult(), null, "entityResults", null, 0, -1, XmlSqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlSqlResultSetMapping_ColumnResults(), this.getColumnResult(), null, "columnResults", null, 0, -1, XmlSqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(xmlStoredProcedureParameterEClass, XmlStoredProcedureParameter.class, "XmlStoredProcedureParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlTableEClass, XmlTable.class, "XmlTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -11604,6 +12688,26 @@ public class OrmPackage extends EPackageImpl
public static final EAttribute COLUMN_RESULT__NAME = eINSTANCE.getColumnResult_Name();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult <em>Constructor Result</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult()
+ * @generated
+ */
+ public static final EClass CONSTRUCTOR_RESULT = eINSTANCE.getConstructorResult();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert <em>Xml Convert</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlConvert
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert()
+ * @generated
+ */
+ public static final EClass XML_CONVERT = eINSTANCE.getXmlConvert();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12074,6 +13178,16 @@ public class OrmPackage extends EPackageImpl
public static final EAttribute FIELD_RESULT__COLUMN = eINSTANCE.getFieldResult_Column();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey <em>Xml Foreign Key</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey()
+ * @generated
+ */
+ public static final EClass XML_FOREIGN_KEY = eINSTANCE.getXmlForeignKey();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue <em>Xml Generated Value</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12196,6 +13310,16 @@ public class OrmPackage extends EPackageImpl
public static final EReference XML_ID_CLASS_CONTAINER__ID_CLASS = eINSTANCE.getXmlIdClassContainer_IdClass();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex <em>Xml Index</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlIndex
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex()
+ * @generated
+ */
+ public static final EClass XML_INDEX = eINSTANCE.getXmlIndex();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Inheritance <em>Inheritance</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12378,6 +13502,36 @@ public class OrmPackage extends EPackageImpl
public static final EReference XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS = eINSTANCE.getXmlMappedSuperclass_EntityListeners();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode <em>Xml Named Attribute Node</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode()
+ * @generated
+ */
+ public static final EClass XML_NAMED_ATTRIBUTE_NODE = eINSTANCE.getXmlNamedAttributeNode();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph <em>Xml Named Entity Graph</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph()
+ * @generated
+ */
+ public static final EClass XML_NAMED_ENTITY_GRAPH = eINSTANCE.getXmlNamedEntityGraph();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph <em>Xml Named Subgraph</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph()
+ * @generated
+ */
+ public static final EClass XML_NAMED_SUBGRAPH = eINSTANCE.getXmlNamedSubgraph();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12388,6 +13542,14 @@ public class OrmPackage extends EPackageImpl
public static final EClass XML_NAMED_NATIVE_QUERY = eINSTANCE.getXmlNamedNativeQuery();
/**
+ * The meta object literal for the '<em><b>Query</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_NAMED_NATIVE_QUERY__QUERY = eINSTANCE.getXmlNamedNativeQuery_Query();
+
+ /**
* The meta object literal for the '<em><b>Result Class</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12414,6 +13576,34 @@ public class OrmPackage extends EPackageImpl
public static final EClass XML_NAMED_QUERY = eINSTANCE.getXmlNamedQuery();
/**
+ * The meta object literal for the '<em><b>Query</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_NAMED_QUERY__QUERY = eINSTANCE.getXmlNamedQuery_Query();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery()
+ * @generated
+ */
+ public static final EClass XML_NAMED_STORED_PROCEDURE_QUERY = eINSTANCE.getXmlNamedStoredProcedureQuery();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter()
+ * @generated
+ */
+ public static final EClass XML_STORED_PROCEDURE_PARAMETER = eINSTANCE.getXmlStoredProcedureParameter();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12684,14 +13874,6 @@ public class OrmPackage extends EPackageImpl
public static final EAttribute XML_QUERY__NAME = eINSTANCE.getXmlQuery_Name();
/**
- * The meta object literal for the '<em><b>Query</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute XML_QUERY__QUERY = eINSTANCE.getXmlQuery_Query();
-
- /**
* The meta object literal for the '<em><b>Hints</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12788,14 +13970,14 @@ public class OrmPackage extends EPackageImpl
public static final EAttribute XML_SEQUENCE_GENERATOR__SEQUENCE_NAME = eINSTANCE.getXmlSequenceGenerator_SequenceName();
/**
- * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping <em>Xml Sql Result Set Mapping</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getSqlResultSetMapping()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping()
* @generated
*/
- public static final EClass SQL_RESULT_SET_MAPPING = eINSTANCE.getSqlResultSetMapping();
+ public static final EClass XML_SQL_RESULT_SET_MAPPING = eINSTANCE.getXmlSqlResultSetMapping();
/**
* The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -12803,7 +13985,7 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public static final EAttribute SQL_RESULT_SET_MAPPING__NAME = eINSTANCE.getSqlResultSetMapping_Name();
+ public static final EAttribute XML_SQL_RESULT_SET_MAPPING__NAME = eINSTANCE.getXmlSqlResultSetMapping_Name();
/**
* The meta object literal for the '<em><b>Entity Results</b></em>' containment reference list feature.
@@ -12811,7 +13993,7 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public static final EReference SQL_RESULT_SET_MAPPING__ENTITY_RESULTS = eINSTANCE.getSqlResultSetMapping_EntityResults();
+ public static final EReference XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS = eINSTANCE.getXmlSqlResultSetMapping_EntityResults();
/**
* The meta object literal for the '<em><b>Column Results</b></em>' containment reference list feature.
@@ -12819,7 +14001,7 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public static final EReference SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = eINSTANCE.getSqlResultSetMapping_ColumnResults();
+ public static final EReference XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = eINSTANCE.getXmlSqlResultSetMapping_ColumnResults();
/**
* The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
index b5117c4..37787c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -24,6 +24,10 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlAssociationOverride_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlAssociationOverride_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -42,7 +46,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverride, XmlJoinColumnContainer, XmlAssociationOverride_2_0
+public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverride, XmlJoinColumnContainer, XmlAssociationOverride_2_0, XmlAssociationOverride_2_1
{
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -105,6 +109,16 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
protected String description = DESCRIPTION_EDEFAULT;
/**
+ * The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 foreignKey;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -184,6 +198,66 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
}
/**
+ * Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key</em>' containment reference.
+ * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverride_2_1_ForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getForeignKey()
+ {
+ return foreignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ foreignKey = newForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY, oldForeignKey, newForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride#getForeignKey <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key</em>' containment reference.
+ * @see #getForeignKey()
+ * @generated
+ */
+ public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ {
+ if (newForeignKey != foreignKey)
+ {
+ NotificationChain msgs = null;
+ if (foreignKey != null)
+ msgs = ((InternalEObject)foreignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY, null, msgs);
+ if (newForeignKey != null)
+ msgs = ((InternalEObject)newForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY, null, msgs);
+ msgs = basicSetForeignKey(newForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY, newForeignKey, newForeignKey));
+ }
+
+ /**
* Returns the value of the '<em><b>Join Table</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -292,6 +366,8 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
return ((InternalEList<?>)getJoinColumns()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ASSOCIATION_OVERRIDE__JOIN_TABLE:
return basicSetJoinTable(null, msgs);
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
+ return basicSetForeignKey(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -314,6 +390,8 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
return getJoinTable();
case OrmPackage.XML_ASSOCIATION_OVERRIDE__DESCRIPTION:
return getDescription();
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
+ return getForeignKey();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -342,6 +420,9 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
case OrmPackage.XML_ASSOCIATION_OVERRIDE__DESCRIPTION:
setDescription((String)newValue);
return;
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -368,6 +449,9 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
case OrmPackage.XML_ASSOCIATION_OVERRIDE__DESCRIPTION:
setDescription(DESCRIPTION_EDEFAULT);
return;
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)null);
+ return;
}
super.eUnset(featureID);
}
@@ -390,6 +474,8 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
return joinTable != null;
case OrmPackage.XML_ASSOCIATION_OVERRIDE__DESCRIPTION:
return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
+ return foreignKey != null;
}
return super.eIsSet(featureID);
}
@@ -426,6 +512,14 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
default: return -1;
}
}
+ if (baseClass == XmlAssociationOverride_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY: return OrmV2_1Package.XML_ASSOCIATION_OVERRIDE_21__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -461,6 +555,14 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
default: return -1;
}
}
+ if (baseClass == XmlAssociationOverride_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_ASSOCIATION_OVERRIDE_21__FOREIGN_KEY: return OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -499,6 +601,7 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
buildNameTranslator(),
buildDescriptionTranslator(),
buildJoinColumnTranslator(),
+ buildForeignKeyTranslator(),
buildJoinTableTranslator()
};
}
@@ -518,6 +621,10 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
protected static Translator buildJoinTableTranslator() {
return XmlJoinTable.buildTranslator(JPA.JOIN_TABLE, OrmPackage.eINSTANCE.getXmlJoinTableContainer_JoinTable());
}
+
+ protected static Translator buildForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlAssociationOverride_2_1_ForeignKey());
+ }
// ************ content assist ***********
public TextRange getNameTextCodeAssistRange() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java
index 584e5a3..6601516 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -15,6 +15,10 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1;
import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator;
import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
@@ -58,6 +62,16 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
protected XmlColumn column;
/**
+ * The cached value of the '{@link #getConvert() <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConvert()
+ * @generated
+ * @ordered
+ */
+ protected XmlConvert_2_1 convert;
+
+ /**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -338,6 +352,66 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
}
/**
+ * Returns the value of the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Convert</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Convert</em>' containment reference.
+ * @see #setConvert(XmlConvert_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlConvert_2_1 getConvert()
+ {
+ return convert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ {
+ XmlConvert_2_1 oldConvert = convert;
+ convert = newConvert;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC__CONVERT, oldConvert, newConvert);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlBasic#getConvert <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Convert</em>' containment reference.
+ * @see #getConvert()
+ * @generated
+ */
+ public void setConvert(XmlConvert_2_1 newConvert)
+ {
+ if (newConvert != convert)
+ {
+ NotificationChain msgs = null;
+ if (convert != null)
+ msgs = ((InternalEObject)convert).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_BASIC__CONVERT, null, msgs);
+ if (newConvert != null)
+ msgs = ((InternalEObject)newConvert).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_BASIC__CONVERT, null, msgs);
+ msgs = basicSetConvert(newConvert, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_BASIC__CONVERT, newConvert, newConvert));
+ }
+
+ /**
* Returns the value of the '<em><b>Fetch</b></em>' attribute.
* The default value is <code>"LAZY"</code>.
* The literals are from the enumeration {@link org.eclipse.jpt.jpa.core.resource.orm.FetchType}.
@@ -423,6 +497,8 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
{
case OrmPackage.XML_BASIC__COLUMN:
return basicSetColumn(null, msgs);
+ case OrmPackage.XML_BASIC__CONVERT:
+ return basicSetConvert(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -439,6 +515,8 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
{
case OrmPackage.XML_BASIC__COLUMN:
return getColumn();
+ case OrmPackage.XML_BASIC__CONVERT:
+ return getConvert();
case OrmPackage.XML_BASIC__LOB:
return isLob();
case OrmPackage.XML_BASIC__TEMPORAL:
@@ -466,6 +544,9 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
case OrmPackage.XML_BASIC__COLUMN:
setColumn((XmlColumn)newValue);
return;
+ case OrmPackage.XML_BASIC__CONVERT:
+ setConvert((XmlConvert_2_1)newValue);
+ return;
case OrmPackage.XML_BASIC__LOB:
setLob((Boolean)newValue);
return;
@@ -498,6 +579,9 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
case OrmPackage.XML_BASIC__COLUMN:
setColumn((XmlColumn)null);
return;
+ case OrmPackage.XML_BASIC__CONVERT:
+ setConvert((XmlConvert_2_1)null);
+ return;
case OrmPackage.XML_BASIC__LOB:
setLob(LOB_EDEFAULT);
return;
@@ -529,6 +613,8 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
{
case OrmPackage.XML_BASIC__COLUMN:
return column != null;
+ case OrmPackage.XML_BASIC__CONVERT:
+ return convert != null;
case OrmPackage.XML_BASIC__LOB:
return lob != LOB_EDEFAULT;
case OrmPackage.XML_BASIC__TEMPORAL:
@@ -559,6 +645,14 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
default: return -1;
}
}
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_BASIC__CONVERT: return OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (derivedFeatureID)
@@ -588,6 +682,14 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
default: return -1;
}
}
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT: return OrmPackage.XML_BASIC__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (baseFeatureID)
@@ -657,7 +759,8 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
buildColumnTranslator(),
buildLobTranslator(),
buildTemporalTranslator(),
- buildEnumeratedTranslator()
+ buildEnumeratedTranslator(),
+ buildConvertTranslator()
};
}
@@ -684,4 +787,9 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
protected static Translator buildEnumeratedTranslator() {
return new Translator(JPA.ENUMERATED, OrmPackage.eINSTANCE.getXmlConvertibleMapping_Enumerated());
}
+
+ protected static Translator buildConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.CONVERT, OrmV2_1Package.eINSTANCE.getXmlConvertibleMapping_2_1_Convert());
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java
index 7326309..6a6acb3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Oracle.
+ * Copyright (c) 2009, 2013 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
@@ -11,10 +11,23 @@
package org.eclipse.jpt.jpa.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.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.emf.ecore.EStructuralFeature;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCollectionTable_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlCollectionTable_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -27,9 +40,28 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlCollectionTable extends AbstractXmlReferenceTable implements XmlCollectionTable_2_0
+public class XmlCollectionTable extends AbstractXmlReferenceTable implements XmlCollectionTable_2_0, XmlCollectionTable_2_1
{
/**
+ * The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 foreignKey;
+ /**
+ * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIndexes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlIndex_2_1> indexes;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -50,6 +82,239 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
return OrmPackage.Literals.XML_COLLECTION_TABLE;
}
+ /**
+ * Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key</em>' containment reference.
+ * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlCollectionTable_2_1_ForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getForeignKey()
+ {
+ return foreignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ foreignKey = newForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY, oldForeignKey, newForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlCollectionTable#getForeignKey <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key</em>' containment reference.
+ * @see #getForeignKey()
+ * @generated
+ */
+ public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ {
+ if (newForeignKey != foreignKey)
+ {
+ NotificationChain msgs = null;
+ if (foreignKey != null)
+ msgs = ((InternalEObject)foreignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY, null, msgs);
+ if (newForeignKey != null)
+ msgs = ((InternalEObject)newForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY, null, msgs);
+ msgs = basicSetForeignKey(newForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY, newForeignKey, newForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Indexes</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>Indexes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlCollectionTable_2_1_Indexes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlIndex_2_1> getIndexes()
+ {
+ if (indexes == null)
+ {
+ indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_COLLECTION_TABLE__INDEXES);
+ }
+ return indexes;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
+ return basicSetForeignKey(null, msgs);
+ case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
+ return ((InternalEList<?>)getIndexes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
+ return getForeignKey();
+ case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
+ return getIndexes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
+ getIndexes().clear();
+ getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
+ getIndexes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
+ return foreignKey != null;
+ case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
+ return indexes != null && !indexes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlCollectionTable_2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlCollectionTable_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY: return OrmV2_1Package.XML_COLLECTION_TABLE_21__FOREIGN_KEY;
+ case OrmPackage.XML_COLLECTION_TABLE__INDEXES: return OrmV2_1Package.XML_COLLECTION_TABLE_21__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlCollectionTable_2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlCollectionTable_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_COLLECTION_TABLE_21__FOREIGN_KEY: return OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY;
+ case OrmV2_1Package.XML_COLLECTION_TABLE_21__INDEXES: return OrmPackage.XML_COLLECTION_TABLE__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
// ********** translators **********
public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
@@ -62,7 +327,18 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
buildCatalogTranslator(),
buildSchemaTranslator(),
buildJoinColumnTranslator(),
- buildUniqueConstraintTranslator()
+ buildForeignKeyTranslator(),
+ buildUniqueConstraintTranslator(),
+ buildIndexesTranslator(),
};
}
+
+ protected static Translator buildForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlCollectionTable_2_1_ForeignKey());
+ }
+
+ protected static Translator buildIndexesTranslator() {
+ return XmlIndex.buildTranslator(JPA2_1.INDEX, OrmV2_1Package.eINSTANCE.getXmlCollectionTable_2_1_Indexes());
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvert.java
new file mode 100644
index 0000000..1a4f940
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvert.java
@@ -0,0 +1,441 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Convert</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlConvert extends EBaseObjectImpl implements XmlConvert_2_1
+{
+ /**
+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected static final String DESCRIPTION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected String description = DESCRIPTION_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getConverter() <em>Converter</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConverter()
+ * @generated
+ * @ordered
+ */
+ protected static final String CONVERTER_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getConverter() <em>Converter</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConverter()
+ * @generated
+ * @ordered
+ */
+ protected String converter = CONVERTER_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getAttributeName() <em>Attribute Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getAttributeName()
+ * @generated
+ * @ordered
+ */
+ protected static final String ATTRIBUTE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getAttributeName() <em>Attribute Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getAttributeName()
+ * @generated
+ * @ordered
+ */
+ protected String attributeName = ATTRIBUTE_NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getDisableConversion() <em>Disable Conversion</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDisableConversion()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean DISABLE_CONVERSION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDisableConversion() <em>Disable Conversion</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDisableConversion()
+ * @generated
+ * @ordered
+ */
+ protected Boolean disableConversion = DISABLE_CONVERSION_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlConvert()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_CONVERT;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Description</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Description</em>' attribute.
+ * @see #setDescription(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert_2_1_Description()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert#getDescription <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Description</em>' attribute.
+ * @see #getDescription()
+ * @generated
+ */
+ public void setDescription(String newDescription)
+ {
+ String oldDescription = description;
+ description = newDescription;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERT__DESCRIPTION, oldDescription, description));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Converter</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Converter</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Converter</em>' attribute.
+ * @see #setConverter(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert_2_1_Converter()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getConverter()
+ {
+ return converter;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert#getConverter <em>Converter</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Converter</em>' attribute.
+ * @see #getConverter()
+ * @generated
+ */
+ public void setConverter(String newConverter)
+ {
+ String oldConverter = converter;
+ converter = newConverter;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERT__CONVERTER, oldConverter, converter));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Attribute Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Attribute Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Attribute Name</em>' attribute.
+ * @see #setAttributeName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert_2_1_AttributeName()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getAttributeName()
+ {
+ return attributeName;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert#getAttributeName <em>Attribute Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Attribute Name</em>' attribute.
+ * @see #getAttributeName()
+ * @generated
+ */
+ public void setAttributeName(String newAttributeName)
+ {
+ String oldAttributeName = attributeName;
+ attributeName = newAttributeName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERT__ATTRIBUTE_NAME, oldAttributeName, attributeName));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Disable Conversion</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Disable Conversion</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Disable Conversion</em>' attribute.
+ * @see #setDisableConversion(Boolean)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert_2_1_DisableConversion()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getDisableConversion()
+ {
+ return disableConversion;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert#getDisableConversion <em>Disable Conversion</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Disable Conversion</em>' attribute.
+ * @see #getDisableConversion()
+ * @generated
+ */
+ public void setDisableConversion(Boolean newDisableConversion)
+ {
+ Boolean oldDisableConversion = disableConversion;
+ disableConversion = newDisableConversion;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERT__DISABLE_CONVERSION, oldDisableConversion, disableConversion));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_CONVERT__DESCRIPTION:
+ return getDescription();
+ case OrmPackage.XML_CONVERT__CONVERTER:
+ return getConverter();
+ case OrmPackage.XML_CONVERT__ATTRIBUTE_NAME:
+ return getAttributeName();
+ case OrmPackage.XML_CONVERT__DISABLE_CONVERSION:
+ return getDisableConversion();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_CONVERT__DESCRIPTION:
+ setDescription((String)newValue);
+ return;
+ case OrmPackage.XML_CONVERT__CONVERTER:
+ setConverter((String)newValue);
+ return;
+ case OrmPackage.XML_CONVERT__ATTRIBUTE_NAME:
+ setAttributeName((String)newValue);
+ return;
+ case OrmPackage.XML_CONVERT__DISABLE_CONVERSION:
+ setDisableConversion((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_CONVERT__DESCRIPTION:
+ setDescription(DESCRIPTION_EDEFAULT);
+ return;
+ case OrmPackage.XML_CONVERT__CONVERTER:
+ setConverter(CONVERTER_EDEFAULT);
+ return;
+ case OrmPackage.XML_CONVERT__ATTRIBUTE_NAME:
+ setAttributeName(ATTRIBUTE_NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_CONVERT__DISABLE_CONVERSION:
+ setDisableConversion(DISABLE_CONVERSION_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_CONVERT__DESCRIPTION:
+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case OrmPackage.XML_CONVERT__CONVERTER:
+ return CONVERTER_EDEFAULT == null ? converter != null : !CONVERTER_EDEFAULT.equals(converter);
+ case OrmPackage.XML_CONVERT__ATTRIBUTE_NAME:
+ return ATTRIBUTE_NAME_EDEFAULT == null ? attributeName != null : !ATTRIBUTE_NAME_EDEFAULT.equals(attributeName);
+ case OrmPackage.XML_CONVERT__DISABLE_CONVERSION:
+ return DISABLE_CONVERSION_EDEFAULT == null ? disableConversion != null : !DISABLE_CONVERSION_EDEFAULT.equals(disableConversion);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (description: ");
+ result.append(description);
+ result.append(", converter: ");
+ result.append(converter);
+ result.append(", attributeName: ");
+ result.append(attributeName);
+ result.append(", disableConversion: ");
+ result.append(disableConversion);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildConverterTranslator(),
+ buildAttributeNameTranslator(),
+ buildDisableConversionTranslator(),
+ buildDescriptionTranslator(),
+ };
+ }
+
+ protected static Translator buildConverterTranslator() {
+ return new Translator(JPA2_1.CONVERTER, OrmV2_1Package.eINSTANCE.getXmlConvert_2_1_Converter());
+ }
+
+ protected static Translator buildAttributeNameTranslator() {
+ return new Translator(JPA2_1.ATTRIBUTE_NAME, OrmV2_1Package.eINSTANCE.getXmlConvert_2_1_AttributeName());
+ }
+
+ protected static Translator buildDisableConversionTranslator() {
+ return new Translator(JPA2_1.DISABLE_CONVERSION, OrmV2_1Package.eINSTANCE.getXmlConvert_2_1_DisableConversion());
+ }
+
+ protected static Translator buildDescriptionTranslator() {
+ return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlConvert_2_1_Description());
+ }
+
+} // XmlConvert
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
index 2042f9a..60cff49 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 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.
@@ -19,8 +19,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
@@ -358,15 +356,15 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1
}
protected static Translator buildAutoApplyTranslator() {
- return new BooleanTranslator(JPA2_1.CONVERTER__AUTO_APPLY, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_AutoApply(), Translator.DOM_ATTRIBUTE);
+ return new BooleanTranslator(JPA2_1.AUTO_APPLY, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_AutoApply(), Translator.DOM_ATTRIBUTE);
}
protected static Translator buildDescriptionTranslator() {
- return new Translator(JPA2_1.CONVERTER__DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_Description());
+ return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_Description());
}
protected static Translator buildClassTranslator() {
- return new Translator(JPA2_1.CONVERTER__CLASS, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_ClassName(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA.CLASS, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_ClassName(), Translator.DOM_ATTRIBUTE);
}
} // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java
index 737f685..51a0c5b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConvertibleMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.resource.orm;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
import org.eclipse.jpt.common.core.utility.TextRange;
@@ -34,10 +35,9 @@ import org.eclipse.jpt.common.core.utility.TextRange;
*
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping()
* @model kind="class" interface="true" abstract="true"
- * @extends EBaseObject
* @generated
*/
-public interface XmlConvertibleMapping extends EBaseObject
+public interface XmlConvertibleMapping extends XmlConvertibleMapping_2_1
{
/**
* Returns the value of the '<em><b>Lob</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java
index 97b8f76..5954de1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle.
+ * Copyright (c) 2009, 2013 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
@@ -32,6 +32,12 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlElementCollection_2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer_2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyConvertibleMapping_2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOrderable_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlElementCollection_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -45,9 +51,19 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlElementCollection extends AbstractXmlAttributeMapping implements XmlElementCollection_2_0
+public class XmlElementCollection extends AbstractXmlAttributeMapping implements XmlElementCollection_2_0, XmlElementCollection_2_1
{
/**
+ * The cached value of the '{@link #getConvert() <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConvert()
+ * @generated
+ * @ordered
+ */
+ protected XmlConvert_2_1 convert;
+
+ /**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -288,6 +304,36 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
protected XmlCollectionTable collectionTable;
/**
+ * The cached value of the '{@link #getMapKeyConverts() <em>Map Key Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> mapKeyConverts;
+
+ /**
+ * The cached value of the '{@link #getMapKeyForeignKey() <em>Map Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 mapKeyForeignKey;
+
+ /**
+ * The cached value of the '{@link #getConverts() <em>Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> converts;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -309,6 +355,66 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
}
/**
+ * Returns the value of the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Convert</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Convert</em>' containment reference.
+ * @see #setConvert(XmlConvert_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlConvert_2_1 getConvert()
+ {
+ return convert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ {
+ XmlConvert_2_1 oldConvert = convert;
+ convert = newConvert;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ELEMENT_COLLECTION__CONVERT, oldConvert, newConvert);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection#getConvert <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Convert</em>' containment reference.
+ * @see #getConvert()
+ * @generated
+ */
+ public void setConvert(XmlConvert_2_1 newConvert)
+ {
+ if (newConvert != convert)
+ {
+ NotificationChain msgs = null;
+ if (convert != null)
+ msgs = ((InternalEObject)convert).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ELEMENT_COLLECTION__CONVERT, null, msgs);
+ if (newConvert != null)
+ msgs = ((InternalEObject)newConvert).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ELEMENT_COLLECTION__CONVERT, null, msgs);
+ msgs = basicSetConvert(newConvert, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ELEMENT_COLLECTION__CONVERT, newConvert, newConvert));
+ }
+
+ /**
* Returns the value of the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -1056,6 +1162,112 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
}
/**
+ * Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Converts</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>Map Key Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection_2_1_MapKeyConverts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getMapKeyConverts()
+ {
+ if (mapKeyConverts == null)
+ {
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS);
+ }
+ return mapKeyConverts;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Map Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
+ * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection_2_1_MapKeyForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getMapKeyForeignKey()
+ {
+ return mapKeyForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldMapKeyForeignKey = mapKeyForeignKey;
+ mapKeyForeignKey = newMapKeyForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY, oldMapKeyForeignKey, newMapKeyForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection#getMapKeyForeignKey <em>Map Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Map Key Foreign Key</em>' containment reference.
+ * @see #getMapKeyForeignKey()
+ * @generated
+ */
+ public void setMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey)
+ {
+ if (newMapKeyForeignKey != mapKeyForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (mapKeyForeignKey != null)
+ msgs = ((InternalEObject)mapKeyForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY, null, msgs);
+ if (newMapKeyForeignKey != null)
+ msgs = ((InternalEObject)newMapKeyForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY, null, msgs);
+ msgs = basicSetMapKeyForeignKey(newMapKeyForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY, newMapKeyForeignKey, newMapKeyForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Converts</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>Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection_2_1_Converts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getConverts()
+ {
+ if (converts == null)
+ {
+ converts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS);
+ }
+ return converts;
+ }
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1065,6 +1277,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
{
switch (featureID)
{
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
+ return basicSetConvert(null, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_COLUMN:
return basicSetOrderColumn(null, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_OVERRIDES:
@@ -1085,6 +1299,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return basicSetColumn(null, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__COLLECTION_TABLE:
return basicSetCollectionTable(null, msgs);
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS:
+ return ((InternalEList<?>)getMapKeyConverts()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
+ return basicSetMapKeyForeignKey(null, msgs);
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
+ return ((InternalEList<?>)getConverts()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -1099,6 +1319,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
{
switch (featureID)
{
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
+ return getConvert();
case OrmPackage.XML_ELEMENT_COLLECTION__LOB:
return isLob();
case OrmPackage.XML_ELEMENT_COLLECTION__TEMPORAL:
@@ -1135,6 +1357,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return getColumn();
case OrmPackage.XML_ELEMENT_COLLECTION__COLLECTION_TABLE:
return getCollectionTable();
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS:
+ return getMapKeyConverts();
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
+ return getMapKeyForeignKey();
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
+ return getConverts();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -1150,6 +1378,9 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
{
switch (featureID)
{
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
+ setConvert((XmlConvert_2_1)newValue);
+ return;
case OrmPackage.XML_ELEMENT_COLLECTION__LOB:
setLob((Boolean)newValue);
return;
@@ -1208,6 +1439,17 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__COLLECTION_TABLE:
setCollectionTable((XmlCollectionTable)newValue);
return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
+ setMapKeyForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
+ getConverts().clear();
+ getConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -1222,6 +1464,9 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
{
switch (featureID)
{
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
+ setConvert((XmlConvert_2_1)null);
+ return;
case OrmPackage.XML_ELEMENT_COLLECTION__LOB:
setLob(LOB_EDEFAULT);
return;
@@ -1276,6 +1521,15 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__COLLECTION_TABLE:
setCollectionTable((XmlCollectionTable)null);
return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
+ setMapKeyForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
+ getConverts().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -1290,6 +1544,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
{
switch (featureID)
{
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
+ return convert != null;
case OrmPackage.XML_ELEMENT_COLLECTION__LOB:
return lob != LOB_EDEFAULT;
case OrmPackage.XML_ELEMENT_COLLECTION__TEMPORAL:
@@ -1326,6 +1582,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return column != null;
case OrmPackage.XML_ELEMENT_COLLECTION__COLLECTION_TABLE:
return collectionTable != null;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS:
+ return mapKeyConverts != null && !mapKeyConverts.isEmpty();
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
+ return mapKeyForeignKey != null;
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
+ return converts != null && !converts.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -1338,6 +1600,14 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT: return OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (derivedFeatureID)
@@ -1412,6 +1682,16 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
default: return -1;
}
}
+ if (baseClass == XmlElementCollection_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS: return OrmV2_1Package.XML_ELEMENT_COLLECTION_21__MAP_KEY_CONVERTS;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY: return OrmV2_1Package.XML_ELEMENT_COLLECTION_21__MAP_KEY_FOREIGN_KEY;
+ case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS: return OrmV2_1Package.XML_ELEMENT_COLLECTION_21__CONVERTS;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -1423,6 +1703,14 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT: return OrmPackage.XML_ELEMENT_COLLECTION__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (baseFeatureID)
@@ -1497,6 +1785,16 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
default: return -1;
}
}
+ if (baseClass == XmlElementCollection_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_ELEMENT_COLLECTION_21__MAP_KEY_CONVERTS: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS;
+ case OrmV2_1Package.XML_ELEMENT_COLLECTION_21__MAP_KEY_FOREIGN_KEY: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY;
+ case OrmV2_1Package.XML_ELEMENT_COLLECTION_21__CONVERTS: return OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -1588,14 +1886,17 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
buildMapKeyTemporalTranslator(),
buildMapKeyEnumeratedTranslator(),
buildMapKeyAttributeOverrideTranslator(),
+ buildMapKeyConvertTranslator(),
XmlColumn.buildTranslator(JPA2_0.MAP_KEY_COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyColumn()),
XmlJoinColumn.buildTranslator(JPA2_0.MAP_KEY_JOIN_COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyJoinColumns()),
+ buildMapKeyForeignKeyTranslator(),
XmlColumn.buildTranslator(JPA.COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_Column()),
buildTemporalTranslator(),
buildEnumeratedTranslator(),
buildLobTranslator(),
buildAttributeOverrideTranslator(),
buildAssociationOverrideTranslator(),
+ buildConvertTranslator(),
XmlCollectionTable.buildTranslator(JPA2_0.COLLECTION_TABLE, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_CollectionTable())
};
}
@@ -1660,6 +1961,18 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides());
}
+ protected static Translator buildMapKeyForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.MAP_KEY_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlElementCollection_2_1_MapKeyForeignKey());
+ }
+
+ protected static Translator buildMapKeyConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.MAP_KEY_CONVERT, OrmV2_1Package.eINSTANCE.getXmlElementCollection_2_1_MapKeyConverts());
+ }
+
+ protected static Translator buildConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.CONVERT, OrmV2_1Package.eINSTANCE.getXmlElementCollection_2_1_Converts());
+ }
+
// ********** refactoring **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java
index 486eb8e..5d28dd5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,6 +20,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.jpa.core.MappingKeys;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlEmbedded_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlEmbedded_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -38,7 +42,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
+public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0, XmlEmbedded_2_1
{
/**
* The cached value of the '{@link #getAssociationOverrides() <em>Association Overrides</em>}' containment reference list.
@@ -51,6 +55,16 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
protected EList<XmlAssociationOverride> associationOverrides;
/**
+ * The cached value of the '{@link #getConverts() <em>Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> converts;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -95,6 +109,29 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
}
/**
+ * Returns the value of the '<em><b>Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Converts</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>Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbedded_2_1_Converts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getConverts()
+ {
+ if (converts == null)
+ {
+ converts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_EMBEDDED__CONVERTS);
+ }
+ return converts;
+ }
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -106,6 +143,8 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
{
case OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES:
return ((InternalEList<?>)getAssociationOverrides()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_EMBEDDED__CONVERTS:
+ return ((InternalEList<?>)getConverts()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -122,6 +161,8 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
{
case OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES:
return getAssociationOverrides();
+ case OrmPackage.XML_EMBEDDED__CONVERTS:
+ return getConverts();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -141,6 +182,10 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
getAssociationOverrides().clear();
getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
return;
+ case OrmPackage.XML_EMBEDDED__CONVERTS:
+ getConverts().clear();
+ getConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -158,6 +203,9 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
case OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES:
getAssociationOverrides().clear();
return;
+ case OrmPackage.XML_EMBEDDED__CONVERTS:
+ getConverts().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -174,6 +222,8 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
{
case OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES:
return associationOverrides != null && !associationOverrides.isEmpty();
+ case OrmPackage.XML_EMBEDDED__CONVERTS:
+ return converts != null && !converts.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -201,6 +251,14 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
default: return -1;
}
}
+ if (baseClass == XmlEmbedded_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_EMBEDDED__CONVERTS: return OrmV2_1Package.XML_EMBEDDED_21__CONVERTS;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -227,6 +285,14 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
default: return -1;
}
}
+ if (baseClass == XmlEmbedded_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_EMBEDDED_21__CONVERTS: return OrmPackage.XML_EMBEDDED__CONVERTS;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -246,11 +312,17 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0
buildNameTranslator(),
buildAccessTranslator(),
buildAttributeOverrideTranslator(),
- buildAssociationOverrideTranslator()
+ buildAssociationOverrideTranslator(),
+ buildConvertTranslator()
};
}
protected static Translator buildAssociationOverrideTranslator() {
return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides());
}
+
+ protected static Translator buildConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.CONVERT, OrmV2_1Package.eINSTANCE.getXmlEmbedded_2_1_Converts());
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java
index 72f58c1..95c060a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -27,6 +27,14 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlEntity_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlEntity_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedEntityGraph_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlQueryContainer_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -61,10 +69,20 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContainer, XmlGeneratorContainer, XmlEventMethodContainer, XmlAttributeOverrideContainer, XmlAssociationOverrideContainer, XmlEntity_2_0, XmlIdClassContainer
+public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContainer, XmlGeneratorContainer, XmlEventMethodContainer, XmlAttributeOverrideContainer, XmlAssociationOverrideContainer, XmlEntity_2_0, XmlIdClassContainer, XmlEntity_2_1
{
/**
+ * The cached value of the '{@link #getNamedStoredProcedureQueries() <em>Named Stored Procedure Queries</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedStoredProcedureQueries()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedStoredProcedureQuery_2_1> namedStoredProcedureQueries;
+
+ /**
* The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -225,6 +243,36 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
protected XmlClassReference idClass;
/**
+ * The cached value of the '{@link #getPrimaryKeyForeignKey() <em>Primary Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPrimaryKeyForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 primaryKeyForeignKey;
+
+ /**
+ * The cached value of the '{@link #getConverts() <em>Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> converts;
+
+ /**
+ * The cached value of the '{@link #getNamedEntityGraphs() <em>Named Entity Graphs</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedEntityGraphs()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedEntityGraph_2_1> namedEntityGraphs;
+
+ /**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -322,7 +370,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @generated
* @ordered
*/
- protected EList<SqlResultSetMapping> sqlResultSetMappings;
+ protected EList<XmlSqlResultSetMapping> sqlResultSetMappings;
/**
* The default value of the '{@link #isExcludeDefaultListeners() <em>Exclude Default Listeners</em>}' attribute.
@@ -404,6 +452,29 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
}
/**
+ * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Stored Procedure Queries</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>Named Stored Procedure Queries</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer_2_1_NamedStoredProcedureQueries()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedStoredProcedureQuery_2_1> getNamedStoredProcedureQueries()
+ {
+ if (namedStoredProcedureQueries == null)
+ {
+ namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery_2_1>(XmlNamedStoredProcedureQuery_2_1.class, this, OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES);
+ }
+ return namedStoredProcedureQueries;
+ }
+
+ /**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -605,6 +676,112 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
}
/**
+ * Returns the value of the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Primary Key Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Primary Key Foreign Key</em>' containment reference.
+ * @see #setPrimaryKeyForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntity_2_1_PrimaryKeyForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ {
+ return primaryKeyForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldPrimaryKeyForeignKey = primaryKeyForeignKey;
+ primaryKeyForeignKey = newPrimaryKeyForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY, oldPrimaryKeyForeignKey, newPrimaryKeyForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlEntity#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Primary Key Foreign Key</em>' containment reference.
+ * @see #getPrimaryKeyForeignKey()
+ * @generated
+ */
+ public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ {
+ if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (primaryKeyForeignKey != null)
+ msgs = ((InternalEObject)primaryKeyForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY, null, msgs);
+ if (newPrimaryKeyForeignKey != null)
+ msgs = ((InternalEObject)newPrimaryKeyForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY, null, msgs);
+ msgs = basicSetPrimaryKeyForeignKey(newPrimaryKeyForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY, newPrimaryKeyForeignKey, newPrimaryKeyForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Converts</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>Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntity_2_1_Converts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getConverts()
+ {
+ if (converts == null)
+ {
+ converts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ENTITY__CONVERTS);
+ }
+ return converts;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Named Entity Graphs</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedEntityGraph_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Entity Graphs</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>Named Entity Graphs</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntity_2_1_NamedEntityGraphs()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedEntityGraph_2_1> getNamedEntityGraphs()
+ {
+ if (namedEntityGraphs == null)
+ {
+ namedEntityGraphs = new EObjectContainmentEList<XmlNamedEntityGraph_2_1>(XmlNamedEntityGraph_2_1.class, this, OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS);
+ }
+ return namedEntityGraphs;
+ }
+
+ /**
* Returns the value of the '<em><b>Inheritance</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -927,7 +1104,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
/**
* Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
@@ -939,11 +1116,11 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @model containment="true"
* @generated
*/
- public EList<SqlResultSetMapping> getSqlResultSetMappings()
+ public EList<XmlSqlResultSetMapping> getSqlResultSetMappings()
{
if (sqlResultSetMappings == null)
{
- sqlResultSetMappings = new EObjectContainmentEList<SqlResultSetMapping>(SqlResultSetMapping.class, this, OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS);
+ sqlResultSetMappings = new EObjectContainmentEList<XmlSqlResultSetMapping>(XmlSqlResultSetMapping.class, this, OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS);
}
return sqlResultSetMappings;
}
@@ -1589,6 +1766,8 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
+ return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ENTITY__NAMED_QUERIES:
return ((InternalEList<?>)getNamedQueries()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
@@ -1617,6 +1796,12 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
return ((InternalEList<?>)getAssociationOverrides()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ENTITY__ID_CLASS:
return basicSetIdClass(null, msgs);
+ case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
+ return basicSetPrimaryKeyForeignKey(null, msgs);
+ case OrmPackage.XML_ENTITY__CONVERTS:
+ return ((InternalEList<?>)getConverts()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS:
+ return ((InternalEList<?>)getNamedEntityGraphs()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ENTITY__TABLE:
return basicSetTable(null, msgs);
case OrmPackage.XML_ENTITY__SECONDARY_TABLES:
@@ -1645,6 +1830,8 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
+ return getNamedStoredProcedureQueries();
case OrmPackage.XML_ENTITY__NAMED_QUERIES:
return getNamedQueries();
case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
@@ -1675,6 +1862,12 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
return getCacheable();
case OrmPackage.XML_ENTITY__ID_CLASS:
return getIdClass();
+ case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
+ return getPrimaryKeyForeignKey();
+ case OrmPackage.XML_ENTITY__CONVERTS:
+ return getConverts();
+ case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS:
+ return getNamedEntityGraphs();
case OrmPackage.XML_ENTITY__NAME:
return getName();
case OrmPackage.XML_ENTITY__TABLE:
@@ -1712,6 +1905,10 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
+ getNamedStoredProcedureQueries().clear();
+ getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery_2_1>)newValue);
+ return;
case OrmPackage.XML_ENTITY__NAMED_QUERIES:
getNamedQueries().clear();
getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue);
@@ -1761,6 +1958,17 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
case OrmPackage.XML_ENTITY__ID_CLASS:
setIdClass((XmlClassReference)newValue);
return;
+ case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
+ setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_ENTITY__CONVERTS:
+ getConverts().clear();
+ getConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
+ case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS:
+ getNamedEntityGraphs().clear();
+ getNamedEntityGraphs().addAll((Collection<? extends XmlNamedEntityGraph_2_1>)newValue);
+ return;
case OrmPackage.XML_ENTITY__NAME:
setName((String)newValue);
return;
@@ -1786,7 +1994,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
return;
case OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS:
getSqlResultSetMappings().clear();
- getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue);
+ getSqlResultSetMappings().addAll((Collection<? extends XmlSqlResultSetMapping>)newValue);
return;
case OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS:
setExcludeDefaultListeners((Boolean)newValue);
@@ -1811,6 +2019,9 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
+ getNamedStoredProcedureQueries().clear();
+ return;
case OrmPackage.XML_ENTITY__NAMED_QUERIES:
getNamedQueries().clear();
return;
@@ -1856,6 +2067,15 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
case OrmPackage.XML_ENTITY__ID_CLASS:
setIdClass((XmlClassReference)null);
return;
+ case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
+ setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_ENTITY__CONVERTS:
+ getConverts().clear();
+ return;
+ case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS:
+ getNamedEntityGraphs().clear();
+ return;
case OrmPackage.XML_ENTITY__NAME:
setName(NAME_EDEFAULT);
return;
@@ -1903,6 +2123,8 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
+ return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
case OrmPackage.XML_ENTITY__NAMED_QUERIES:
return namedQueries != null && !namedQueries.isEmpty();
case OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES:
@@ -1933,6 +2155,12 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
return CACHEABLE_EDEFAULT == null ? cacheable != null : !CACHEABLE_EDEFAULT.equals(cacheable);
case OrmPackage.XML_ENTITY__ID_CLASS:
return idClass != null;
+ case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
+ return primaryKeyForeignKey != null;
+ case OrmPackage.XML_ENTITY__CONVERTS:
+ return converts != null && !converts.isEmpty();
+ case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS:
+ return namedEntityGraphs != null && !namedEntityGraphs.isEmpty();
case OrmPackage.XML_ENTITY__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
case OrmPackage.XML_ENTITY__TABLE:
@@ -1967,6 +2195,14 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlQueryContainer_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES: return OrmV2_1Package.XML_QUERY_CONTAINER_21__NAMED_STORED_PROCEDURE_QUERIES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlQueryContainer.class)
{
switch (derivedFeatureID)
@@ -2038,6 +2274,16 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
default: return -1;
}
}
+ if (baseClass == XmlEntity_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY: return OrmV2_1Package.XML_ENTITY_21__PRIMARY_KEY_FOREIGN_KEY;
+ case OrmPackage.XML_ENTITY__CONVERTS: return OrmV2_1Package.XML_ENTITY_21__CONVERTS;
+ case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS: return OrmV2_1Package.XML_ENTITY_21__NAMED_ENTITY_GRAPHS;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -2049,6 +2295,14 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlQueryContainer_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_QUERY_CONTAINER_21__NAMED_STORED_PROCEDURE_QUERIES: return OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlQueryContainer.class)
{
switch (baseFeatureID)
@@ -2120,6 +2374,16 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
default: return -1;
}
}
+ if (baseClass == XmlEntity_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_ENTITY_21__PRIMARY_KEY_FOREIGN_KEY: return OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY;
+ case OrmV2_1Package.XML_ENTITY_21__CONVERTS: return OrmPackage.XML_ENTITY__CONVERTS;
+ case OrmV2_1Package.XML_ENTITY_21__NAMED_ENTITY_GRAPHS: return OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -2177,6 +2441,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
buildTableTranslator(),
buildSecondaryTableTranslator(),
buildPrimaryKeyJoinColumnTranslator(),
+ buildPrimaryKeyForeignKeyTranslator(),
buildIdClassTranslator(),
buildInheritanceTranslator(),
buildDiscriminatorValueTranslator(),
@@ -2185,6 +2450,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
buildTableGeneratorTranslator(),
buildNamedQueryTranslator(),
buildNamedNativeQueryTranslator(),
+ buildNamedStoredProcedureQueryTranslator(),
buildSqlResultSetMappingTranslator(),
buildExcludeDefaultListenersTranslator(),
buildExcludeSuperclassListenersTranslator(),
@@ -2198,6 +2464,8 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
PostLoad.buildTranslator(),
buildAttributeOverrideTranslator(),
buildAssociationOverrideTranslator(),
+ buildConvertTranslator(),
+ buildNamedEntityGraphTranslator(),
Attributes.buildTranslator()
};
}
@@ -2254,8 +2522,12 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
return XmlNamedNativeQuery.buildTranslator(JPA.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries());
}
+ protected static Translator buildNamedStoredProcedureQueryTranslator() {
+ return XmlNamedStoredProcedureQuery.buildTranslator(JPA2_1.NAMED_STORED_PROCEDURE_QUERY, OrmV2_1Package.eINSTANCE.getXmlQueryContainer_2_1_NamedStoredProcedureQueries());
+ }
+
protected static Translator buildSqlResultSetMappingTranslator() {
- return SqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntity_SqlResultSetMappings());
+ return XmlSqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntity_SqlResultSetMappings());
}
protected static Translator buildExcludeDefaultListenersTranslator() {
@@ -2305,4 +2577,16 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
protected static Translator buildAssociationOverrideTranslator() {
return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides());
}
+
+ protected static Translator buildConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.CONVERT, OrmV2_1Package.eINSTANCE.getXmlEntity_2_1_Converts());
+ }
+
+ protected static Translator buildPrimaryKeyForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.PRIMARY_KEY_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlEntity_2_1_PrimaryKeyForeignKey());
+ }
+
+ protected static Translator buildNamedEntityGraphTranslator() {
+ return XmlNamedEntityGraph.buildTranslator(JPA2_1.NAMED_ENTITY_GRAPH, OrmV2_1Package.eINSTANCE.getXmlEntity_2_1_NamedEntityGraphs());
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
index 8d5fdfa..fb52785 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -30,6 +30,8 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlEntityMappings_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlQueryContainer_2_1;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
@@ -73,6 +75,16 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContainer, XmlAccessHolder, XmlEntityMappings_2_1
{
/**
+ * The cached value of the '{@link #getNamedStoredProcedureQueries() <em>Named Stored Procedure Queries</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedStoredProcedureQueries()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedStoredProcedureQuery_2_1> namedStoredProcedureQueries;
+
+ /**
* The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -240,7 +252,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
* @generated
* @ordered
*/
- protected EList<SqlResultSetMapping> sqlResultSetMappings;
+ protected EList<XmlSqlResultSetMapping> sqlResultSetMappings;
/**
* The cached value of the '{@link #getMappedSuperclasses() <em>Mapped Superclasses</em>}' containment reference list.
@@ -294,6 +306,29 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
}
/**
+ * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Stored Procedure Queries</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>Named Stored Procedure Queries</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer_2_1_NamedStoredProcedureQueries()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedStoredProcedureQuery_2_1> getNamedStoredProcedureQueries()
+ {
+ if (namedStoredProcedureQueries == null)
+ {
+ namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery_2_1>(XmlNamedStoredProcedureQuery_2_1.class, this, OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES);
+ }
+ return namedStoredProcedureQueries;
+ }
+
+ /**
* Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery}.
* <!-- begin-user-doc -->
@@ -645,7 +680,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
/**
* Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
@@ -657,11 +692,11 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
* @model containment="true"
* @generated
*/
- public EList<SqlResultSetMapping> getSqlResultSetMappings()
+ public EList<XmlSqlResultSetMapping> getSqlResultSetMappings()
{
if (sqlResultSetMappings == null)
{
- sqlResultSetMappings = new EObjectContainmentEList<SqlResultSetMapping>(SqlResultSetMapping.class, this, OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS);
+ sqlResultSetMappings = new EObjectContainmentEList<XmlSqlResultSetMapping>(XmlSqlResultSetMapping.class, this, OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS);
}
return sqlResultSetMappings;
}
@@ -745,6 +780,8 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
+ return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
return ((InternalEList<?>)getNamedQueries()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
@@ -779,6 +816,8 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
+ return getNamedStoredProcedureQueries();
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
return getNamedQueries();
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
@@ -824,6 +863,10 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
+ getNamedStoredProcedureQueries().clear();
+ getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery_2_1>)newValue);
+ return;
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
getNamedQueries().clear();
getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue);
@@ -864,7 +907,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
return;
case OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS:
getSqlResultSetMappings().clear();
- getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue);
+ getSqlResultSetMappings().addAll((Collection<? extends XmlSqlResultSetMapping>)newValue);
return;
case OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES:
getMappedSuperclasses().clear();
@@ -892,6 +935,9 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
+ getNamedStoredProcedureQueries().clear();
+ return;
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
getNamedQueries().clear();
return;
@@ -951,6 +997,8 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
{
switch (featureID)
{
+ case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
+ return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES:
return namedQueries != null && !namedQueries.isEmpty();
case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES:
@@ -994,6 +1042,14 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlQueryContainer_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES: return OrmV2_1Package.XML_QUERY_CONTAINER_21__NAMED_STORED_PROCEDURE_QUERIES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlQueryContainer.class)
{
switch (derivedFeatureID)
@@ -1037,6 +1093,14 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
{
+ if (baseClass == XmlQueryContainer_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_QUERY_CONTAINER_21__NAMED_STORED_PROCEDURE_QUERIES: return OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlQueryContainer.class)
{
switch (baseFeatureID)
@@ -1179,7 +1243,8 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_TableGenerators()),
XmlNamedQuery.buildTranslator(JPA.NAMED_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedQueries()),
XmlNamedNativeQuery.buildTranslator(JPA.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries()),
- SqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntityMappings_SqlResultSetMappings()),
+ XmlNamedStoredProcedureQuery.buildTranslator(JPA2_1.NAMED_STORED_PROCEDURE_QUERY, OrmV2_1Package.eINSTANCE.getXmlQueryContainer_2_1_NamedStoredProcedureQueries()),
+ XmlSqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntityMappings_SqlResultSetMappings()),
XmlMappedSuperclass.buildTranslator(JPA.MAPPED_SUPERCLASS, OrmPackage.eINSTANCE.getXmlEntityMappings_MappedSuperclasses()),
XmlEntity.buildTranslator(JPA.ENTITY, OrmPackage.eINSTANCE.getXmlEntityMappings_Entities()),
XmlEmbeddable.buildTranslator(JPA.EMBEDDABLE, OrmPackage.eINSTANCE.getXmlEntityMappings_Embeddables()),
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlForeignKey.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlForeignKey.java
new file mode 100644
index 0000000..cebdc39
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlForeignKey.java
@@ -0,0 +1,441 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Foreign Key</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlForeignKey extends EBaseObjectImpl implements XmlForeignKey_2_1
+{
+ /**
+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected static final String DESCRIPTION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected String description = DESCRIPTION_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getForeignKeyDefinition() <em>Foreign Key Definition</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKeyDefinition()
+ * @generated
+ * @ordered
+ */
+ protected static final String FOREIGN_KEY_DEFINITION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getForeignKeyDefinition() <em>Foreign Key Definition</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKeyDefinition()
+ * @generated
+ * @ordered
+ */
+ protected String foreignKeyDefinition = FOREIGN_KEY_DEFINITION_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getDisableForeignKey() <em>Disable Foreign Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDisableForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean DISABLE_FOREIGN_KEY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDisableForeignKey() <em>Disable Foreign Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDisableForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected Boolean disableForeignKey = DISABLE_FOREIGN_KEY_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlForeignKey()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_FOREIGN_KEY;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Description</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Description</em>' attribute.
+ * @see #setDescription(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey_2_1_Description()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey#getDescription <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Description</em>' attribute.
+ * @see #getDescription()
+ * @generated
+ */
+ public void setDescription(String newDescription)
+ {
+ String oldDescription = description;
+ description = newDescription;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_FOREIGN_KEY__DESCRIPTION, oldDescription, description));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey_2_1_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.core.resource.orm.XmlForeignKey#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_FOREIGN_KEY__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Foreign Key Definition</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key Definition</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key Definition</em>' attribute.
+ * @see #setForeignKeyDefinition(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey_2_1_ForeignKeyDefinition()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getForeignKeyDefinition()
+ {
+ return foreignKeyDefinition;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey#getForeignKeyDefinition <em>Foreign Key Definition</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key Definition</em>' attribute.
+ * @see #getForeignKeyDefinition()
+ * @generated
+ */
+ public void setForeignKeyDefinition(String newForeignKeyDefinition)
+ {
+ String oldForeignKeyDefinition = foreignKeyDefinition;
+ foreignKeyDefinition = newForeignKeyDefinition;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_FOREIGN_KEY__FOREIGN_KEY_DEFINITION, oldForeignKeyDefinition, foreignKeyDefinition));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Disable Foreign Key</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Disable Foreign Key</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Disable Foreign Key</em>' attribute.
+ * @see #setDisableForeignKey(Boolean)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey_2_1_DisableForeignKey()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getDisableForeignKey()
+ {
+ return disableForeignKey;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey#getDisableForeignKey <em>Disable Foreign Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Disable Foreign Key</em>' attribute.
+ * @see #getDisableForeignKey()
+ * @generated
+ */
+ public void setDisableForeignKey(Boolean newDisableForeignKey)
+ {
+ Boolean oldDisableForeignKey = disableForeignKey;
+ disableForeignKey = newDisableForeignKey;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_FOREIGN_KEY__DISABLE_FOREIGN_KEY, oldDisableForeignKey, disableForeignKey));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_FOREIGN_KEY__DESCRIPTION:
+ return getDescription();
+ case OrmPackage.XML_FOREIGN_KEY__NAME:
+ return getName();
+ case OrmPackage.XML_FOREIGN_KEY__FOREIGN_KEY_DEFINITION:
+ return getForeignKeyDefinition();
+ case OrmPackage.XML_FOREIGN_KEY__DISABLE_FOREIGN_KEY:
+ return getDisableForeignKey();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_FOREIGN_KEY__DESCRIPTION:
+ setDescription((String)newValue);
+ return;
+ case OrmPackage.XML_FOREIGN_KEY__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_FOREIGN_KEY__FOREIGN_KEY_DEFINITION:
+ setForeignKeyDefinition((String)newValue);
+ return;
+ case OrmPackage.XML_FOREIGN_KEY__DISABLE_FOREIGN_KEY:
+ setDisableForeignKey((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_FOREIGN_KEY__DESCRIPTION:
+ setDescription(DESCRIPTION_EDEFAULT);
+ return;
+ case OrmPackage.XML_FOREIGN_KEY__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_FOREIGN_KEY__FOREIGN_KEY_DEFINITION:
+ setForeignKeyDefinition(FOREIGN_KEY_DEFINITION_EDEFAULT);
+ return;
+ case OrmPackage.XML_FOREIGN_KEY__DISABLE_FOREIGN_KEY:
+ setDisableForeignKey(DISABLE_FOREIGN_KEY_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_FOREIGN_KEY__DESCRIPTION:
+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case OrmPackage.XML_FOREIGN_KEY__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_FOREIGN_KEY__FOREIGN_KEY_DEFINITION:
+ return FOREIGN_KEY_DEFINITION_EDEFAULT == null ? foreignKeyDefinition != null : !FOREIGN_KEY_DEFINITION_EDEFAULT.equals(foreignKeyDefinition);
+ case OrmPackage.XML_FOREIGN_KEY__DISABLE_FOREIGN_KEY:
+ return DISABLE_FOREIGN_KEY_EDEFAULT == null ? disableForeignKey != null : !DISABLE_FOREIGN_KEY_EDEFAULT.equals(disableForeignKey);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (description: ");
+ result.append(description);
+ result.append(", name: ");
+ result.append(name);
+ result.append(", foreignKeyDefinition: ");
+ result.append(foreignKeyDefinition);
+ result.append(", disableForeignKey: ");
+ result.append(disableForeignKey);
+ result.append(')');
+ return result.toString();
+ }
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlForeignKey(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildForeignKeyDefinitionTranslator(),
+ buildDisableForeignKeyTranslator(),
+ buildDescriptionTranslator(),
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmV2_1Package.eINSTANCE.getXmlForeignKey_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildForeignKeyDefinitionTranslator() {
+ return new Translator(JPA2_1.FOREIGN_KEY_DEFINITION, OrmV2_1Package.eINSTANCE.getXmlForeignKey_2_1_ForeignKeyDefinition(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildDisableForeignKeyTranslator() {
+ return new Translator(JPA2_1.DISABLE_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlForeignKey_2_1_DisableForeignKey(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildDescriptionTranslator() {
+ return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlForeignKey_2_1_Description());
+ }
+
+} // XmlForeignKey
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java
index 7877c89..aa408d3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -15,6 +15,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -54,6 +57,15 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
*/
protected XmlColumn column;
/**
+ * The cached value of the '{@link #getConvert() <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConvert()
+ * @generated
+ * @ordered
+ */
+ protected XmlConvert_2_1 convert;
+ /**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -210,6 +222,66 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
}
/**
+ * Returns the value of the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Convert</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Convert</em>' containment reference.
+ * @see #setConvert(XmlConvert_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlConvert_2_1 getConvert()
+ {
+ return convert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ {
+ XmlConvert_2_1 oldConvert = convert;
+ convert = newConvert;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID__CONVERT, oldConvert, newConvert);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlId#getConvert <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Convert</em>' containment reference.
+ * @see #getConvert()
+ * @generated
+ */
+ public void setConvert(XmlConvert_2_1 newConvert)
+ {
+ if (newConvert != convert)
+ {
+ NotificationChain msgs = null;
+ if (convert != null)
+ msgs = ((InternalEObject)convert).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID__CONVERT, null, msgs);
+ if (newConvert != null)
+ msgs = ((InternalEObject)newConvert).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ID__CONVERT, null, msgs);
+ msgs = basicSetConvert(newConvert, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID__CONVERT, newConvert, newConvert));
+ }
+
+ /**
* Returns the value of the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -512,6 +584,8 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
{
case OrmPackage.XML_ID__COLUMN:
return basicSetColumn(null, msgs);
+ case OrmPackage.XML_ID__CONVERT:
+ return basicSetConvert(null, msgs);
case OrmPackage.XML_ID__SEQUENCE_GENERATOR:
return basicSetSequenceGenerator(null, msgs);
case OrmPackage.XML_ID__TABLE_GENERATOR:
@@ -534,6 +608,8 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
{
case OrmPackage.XML_ID__COLUMN:
return getColumn();
+ case OrmPackage.XML_ID__CONVERT:
+ return getConvert();
case OrmPackage.XML_ID__LOB:
return isLob();
case OrmPackage.XML_ID__TEMPORAL:
@@ -563,6 +639,9 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
case OrmPackage.XML_ID__COLUMN:
setColumn((XmlColumn)newValue);
return;
+ case OrmPackage.XML_ID__CONVERT:
+ setConvert((XmlConvert_2_1)newValue);
+ return;
case OrmPackage.XML_ID__LOB:
setLob((Boolean)newValue);
return;
@@ -598,6 +677,9 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
case OrmPackage.XML_ID__COLUMN:
setColumn((XmlColumn)null);
return;
+ case OrmPackage.XML_ID__CONVERT:
+ setConvert((XmlConvert_2_1)null);
+ return;
case OrmPackage.XML_ID__LOB:
setLob(LOB_EDEFAULT);
return;
@@ -632,6 +714,8 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
{
case OrmPackage.XML_ID__COLUMN:
return column != null;
+ case OrmPackage.XML_ID__CONVERT:
+ return convert != null;
case OrmPackage.XML_ID__LOB:
return lob != LOB_EDEFAULT;
case OrmPackage.XML_ID__TEMPORAL:
@@ -664,6 +748,14 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
default: return -1;
}
}
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ID__CONVERT: return OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (derivedFeatureID)
@@ -702,6 +794,14 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
default: return -1;
}
}
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT: return OrmPackage.XML_ID__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (baseFeatureID)
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIndex.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIndex.java
new file mode 100644
index 0000000..dfb8299
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlIndex.java
@@ -0,0 +1,442 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xm Index</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlIndex extends EBaseObjectImpl implements XmlIndex_2_1
+{
+ /**
+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected static final String DESCRIPTION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected String description = DESCRIPTION_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getColumnList() <em>Column List</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getColumnList()
+ * @generated
+ * @ordered
+ */
+ protected static final String COLUMN_LIST_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getColumnList() <em>Column List</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getColumnList()
+ * @generated
+ * @ordered
+ */
+ protected String columnList = COLUMN_LIST_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getUnique() <em>Unique</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getUnique()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean UNIQUE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getUnique() <em>Unique</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getUnique()
+ * @generated
+ * @ordered
+ */
+ protected Boolean unique = UNIQUE_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlIndex()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_INDEX;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Description</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Description</em>' attribute.
+ * @see #setDescription(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex_2_1_Description()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex#getDescription <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Description</em>' attribute.
+ * @see #getDescription()
+ * @generated
+ */
+ public void setDescription(String newDescription)
+ {
+ String oldDescription = description;
+ description = newDescription;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_INDEX__DESCRIPTION, oldDescription, description));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex_2_1_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.core.resource.orm.XmlIndex#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_INDEX__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Column List</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Column List</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Column List</em>' attribute.
+ * @see #setColumnList(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex_2_1_ColumnList()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getColumnList()
+ {
+ return columnList;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex#getColumnList <em>Column List</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Column List</em>' attribute.
+ * @see #getColumnList()
+ * @generated
+ */
+ public void setColumnList(String newColumnList)
+ {
+ String oldColumnList = columnList;
+ columnList = newColumnList;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_INDEX__COLUMN_LIST, oldColumnList, columnList));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Unique</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Unique</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Unique</em>' attribute.
+ * @see #setUnique(Boolean)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex_2_1_Unique()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getUnique()
+ {
+ return unique;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex#getUnique <em>Unique</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Unique</em>' attribute.
+ * @see #getUnique()
+ * @generated
+ */
+ public void setUnique(Boolean newUnique)
+ {
+ Boolean oldUnique = unique;
+ unique = newUnique;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_INDEX__UNIQUE, oldUnique, unique));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_INDEX__DESCRIPTION:
+ return getDescription();
+ case OrmPackage.XML_INDEX__NAME:
+ return getName();
+ case OrmPackage.XML_INDEX__COLUMN_LIST:
+ return getColumnList();
+ case OrmPackage.XML_INDEX__UNIQUE:
+ return getUnique();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_INDEX__DESCRIPTION:
+ setDescription((String)newValue);
+ return;
+ case OrmPackage.XML_INDEX__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_INDEX__COLUMN_LIST:
+ setColumnList((String)newValue);
+ return;
+ case OrmPackage.XML_INDEX__UNIQUE:
+ setUnique((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_INDEX__DESCRIPTION:
+ setDescription(DESCRIPTION_EDEFAULT);
+ return;
+ case OrmPackage.XML_INDEX__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_INDEX__COLUMN_LIST:
+ setColumnList(COLUMN_LIST_EDEFAULT);
+ return;
+ case OrmPackage.XML_INDEX__UNIQUE:
+ setUnique(UNIQUE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_INDEX__DESCRIPTION:
+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case OrmPackage.XML_INDEX__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_INDEX__COLUMN_LIST:
+ return COLUMN_LIST_EDEFAULT == null ? columnList != null : !COLUMN_LIST_EDEFAULT.equals(columnList);
+ case OrmPackage.XML_INDEX__UNIQUE:
+ return UNIQUE_EDEFAULT == null ? unique != null : !UNIQUE_EDEFAULT.equals(unique);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (description: ");
+ result.append(description);
+ result.append(", name: ");
+ result.append(name);
+ result.append(", columnList: ");
+ result.append(columnList);
+ result.append(", unique: ");
+ result.append(unique);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlIndex(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildColumnListTranslator(),
+ buildUniqueTranslator(),
+ buildDescriptionTranslator(),
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmV2_1Package.eINSTANCE.getXmlIndex_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildColumnListTranslator() {
+ return new Translator(JPA2_1.COLUMN_LIST, OrmV2_1Package.eINSTANCE.getXmlIndex_2_1_ColumnList(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildUniqueTranslator() {
+ return new Translator(JPA2_1.UNIQUE, OrmV2_1Package.eINSTANCE.getXmlIndex_2_1_Unique(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildDescriptionTranslator() {
+ return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlIndex_2_1_Description());
+ }
+
+} // XmIndex
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java
index 894c525..7a60c76 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -10,13 +10,20 @@
package org.eclipse.jpt.jpa.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.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlJoinTable_2_1;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -42,9 +49,36 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlJoinTable extends AbstractXmlReferenceTable
+public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTable_2_1
{
/**
+ * The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 foreignKey;
+ /**
+ * The cached value of the '{@link #getInverseForeignKey() <em>Inverse Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getInverseForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 inverseForeignKey;
+ /**
+ * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIndexes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlIndex_2_1> indexes;
+ /**
* The cached value of the '{@link #getInverseJoinColumns() <em>Inverse Join Columns</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -76,6 +110,149 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
}
/**
+ * Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key</em>' containment reference.
+ * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable_2_1_ForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getForeignKey()
+ {
+ return foreignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ foreignKey = newForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY, oldForeignKey, newForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable#getForeignKey <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key</em>' containment reference.
+ * @see #getForeignKey()
+ * @generated
+ */
+ public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ {
+ if (newForeignKey != foreignKey)
+ {
+ NotificationChain msgs = null;
+ if (foreignKey != null)
+ msgs = ((InternalEObject)foreignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY, null, msgs);
+ if (newForeignKey != null)
+ msgs = ((InternalEObject)newForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY, null, msgs);
+ msgs = basicSetForeignKey(newForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY, newForeignKey, newForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Inverse Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Inverse Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Inverse Foreign Key</em>' containment reference.
+ * @see #setInverseForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable_2_1_InverseForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getInverseForeignKey()
+ {
+ return inverseForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetInverseForeignKey(XmlForeignKey_2_1 newInverseForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldInverseForeignKey = inverseForeignKey;
+ inverseForeignKey = newInverseForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY, oldInverseForeignKey, newInverseForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable#getInverseForeignKey <em>Inverse Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Inverse Foreign Key</em>' containment reference.
+ * @see #getInverseForeignKey()
+ * @generated
+ */
+ public void setInverseForeignKey(XmlForeignKey_2_1 newInverseForeignKey)
+ {
+ if (newInverseForeignKey != inverseForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (inverseForeignKey != null)
+ msgs = ((InternalEObject)inverseForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY, null, msgs);
+ if (newInverseForeignKey != null)
+ msgs = ((InternalEObject)newInverseForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY, null, msgs);
+ msgs = basicSetInverseForeignKey(newInverseForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY, newInverseForeignKey, newInverseForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Indexes</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>Indexes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable_2_1_Indexes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlIndex_2_1> getIndexes()
+ {
+ if (indexes == null)
+ {
+ indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_JOIN_TABLE__INDEXES);
+ }
+ return indexes;
+ }
+
+ /**
* Returns the value of the '<em><b>Inverse Join Columns</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn}.
* <!-- begin-user-doc -->
@@ -108,6 +285,12 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
{
switch (featureID)
{
+ case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
+ return basicSetForeignKey(null, msgs);
+ case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
+ return basicSetInverseForeignKey(null, msgs);
+ case OrmPackage.XML_JOIN_TABLE__INDEXES:
+ return ((InternalEList<?>)getIndexes()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS:
return ((InternalEList<?>)getInverseJoinColumns()).basicRemove(otherEnd, msgs);
}
@@ -124,6 +307,12 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
{
switch (featureID)
{
+ case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
+ return getForeignKey();
+ case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
+ return getInverseForeignKey();
+ case OrmPackage.XML_JOIN_TABLE__INDEXES:
+ return getIndexes();
case OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS:
return getInverseJoinColumns();
}
@@ -141,6 +330,16 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
{
switch (featureID)
{
+ case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
+ setInverseForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_JOIN_TABLE__INDEXES:
+ getIndexes().clear();
+ getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ return;
case OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS:
getInverseJoinColumns().clear();
getInverseJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue);
@@ -159,6 +358,15 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
{
switch (featureID)
{
+ case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
+ setInverseForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_JOIN_TABLE__INDEXES:
+ getIndexes().clear();
+ return;
case OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS:
getInverseJoinColumns().clear();
return;
@@ -176,12 +384,60 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
{
switch (featureID)
{
+ case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
+ return foreignKey != null;
+ case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
+ return inverseForeignKey != null;
+ case OrmPackage.XML_JOIN_TABLE__INDEXES:
+ return indexes != null && !indexes.isEmpty();
case OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS:
return inverseJoinColumns != null && !inverseJoinColumns.isEmpty();
}
return super.eIsSet(featureID);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlJoinTable_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY: return OrmV2_1Package.XML_JOIN_TABLE_21__FOREIGN_KEY;
+ case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY: return OrmV2_1Package.XML_JOIN_TABLE_21__INVERSE_FOREIGN_KEY;
+ case OrmPackage.XML_JOIN_TABLE__INDEXES: return OrmV2_1Package.XML_JOIN_TABLE_21__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlJoinTable_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_JOIN_TABLE_21__FOREIGN_KEY: return OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY;
+ case OrmV2_1Package.XML_JOIN_TABLE_21__INVERSE_FOREIGN_KEY: return OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY;
+ case OrmV2_1Package.XML_JOIN_TABLE_21__INDEXES: return OrmPackage.XML_JOIN_TABLE__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
public boolean isSpecified() {
return true;
}
@@ -198,13 +454,29 @@ public class XmlJoinTable extends AbstractXmlReferenceTable
buildCatalogTranslator(),
buildSchemaTranslator(),
buildJoinColumnTranslator(),
+ buildForeignKeyTranslator(),
buildInverseJoinColumnTranslator(),
- buildUniqueConstraintTranslator()
+ buildInverseForeignKeyTranslator(),
+ buildUniqueConstraintTranslator(),
+ buildIndexTranslator()
};
}
+ protected static Translator buildForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlJoinTable_2_1_ForeignKey());
+ }
+
protected static Translator buildInverseJoinColumnTranslator() {
return XmlJoinColumn.buildTranslator(JPA.INVERSE_JOIN_COLUMN, OrmPackage.eINSTANCE.getXmlJoinTable_InverseJoinColumns());
}
+ protected static Translator buildInverseForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.INVERSE_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlJoinTable_2_1_InverseForeignKey());
+ }
+
+ protected static Translator buildIndexTranslator() {
+ return XmlIndex.buildTranslator(JPA2_1.INDEX, OrmV2_1Package.eINSTANCE.getXmlJoinTable_2_1_Indexes());
+ }
+
+
} // JoinTable
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java
index b301292..d5e04ce 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,11 +9,24 @@
******************************************************************************/
package org.eclipse.jpt.jpa.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.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.emf.ecore.EStructuralFeature;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.jpa.core.MappingKeys;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlManyToMany_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlManyToMany_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -32,9 +45,28 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implements XmlManyToMany_2_0
+public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implements XmlManyToMany_2_0, XmlManyToMany_2_1
{
/**
+ * The cached value of the '{@link #getMapKeyConverts() <em>Map Key Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> mapKeyConverts;
+ /**
+ * The cached value of the '{@link #getMapKeyForeignKey() <em>Map Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 mapKeyForeignKey;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -55,6 +87,239 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
return OrmPackage.Literals.XML_MANY_TO_MANY;
}
+ /**
+ * Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Converts</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>Map Key Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToMany_2_1_MapKeyConverts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getMapKeyConverts()
+ {
+ if (mapKeyConverts == null)
+ {
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS);
+ }
+ return mapKeyConverts;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Map Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
+ * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToMany_2_1_MapKeyForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getMapKeyForeignKey()
+ {
+ return mapKeyForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldMapKeyForeignKey = mapKeyForeignKey;
+ mapKeyForeignKey = newMapKeyForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY, oldMapKeyForeignKey, newMapKeyForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany#getMapKeyForeignKey <em>Map Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Map Key Foreign Key</em>' containment reference.
+ * @see #getMapKeyForeignKey()
+ * @generated
+ */
+ public void setMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey)
+ {
+ if (newMapKeyForeignKey != mapKeyForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (mapKeyForeignKey != null)
+ msgs = ((InternalEObject)mapKeyForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY, null, msgs);
+ if (newMapKeyForeignKey != null)
+ msgs = ((InternalEObject)newMapKeyForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY, null, msgs);
+ msgs = basicSetMapKeyForeignKey(newMapKeyForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY, newMapKeyForeignKey, newMapKeyForeignKey));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS:
+ return ((InternalEList<?>)getMapKeyConverts()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ return basicSetMapKeyForeignKey(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS:
+ return getMapKeyConverts();
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ return getMapKeyForeignKey();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ setMapKeyForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ return;
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ setMapKeyForeignKey((XmlForeignKey_2_1)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS:
+ return mapKeyConverts != null && !mapKeyConverts.isEmpty();
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ return mapKeyForeignKey != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlManyToMany_2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlManyToMany_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS: return OrmV2_1Package.XML_MANY_TO_MANY_21__MAP_KEY_CONVERTS;
+ case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY: return OrmV2_1Package.XML_MANY_TO_MANY_21__MAP_KEY_FOREIGN_KEY;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlManyToMany_2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlManyToMany_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_MANY_TO_MANY_21__MAP_KEY_CONVERTS: return OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS;
+ case OrmV2_1Package.XML_MANY_TO_MANY_21__MAP_KEY_FOREIGN_KEY: return OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
public String getMappingKey() {
return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY;
}
@@ -79,10 +344,21 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
buildMapKeyTemporalTranslator(),
buildMapKeyEnumeratedTranslator(),
buildMapKeyAttributeOverrideTranslator(),
+ buildMapKeyConvertTranslator(),
buildMapKeyColumnTranslator(),
buildMapKeyJoinColumnTranslator(),
+ buildMapKeyForeignKeyTranslator(),
buildJoinTableTranslator(),
buildCascadeTranslator()
};
}
+
+ protected static Translator buildMapKeyConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.MAP_KEY_CONVERT, OrmV2_1Package.eINSTANCE.getXmlManyToMany_2_1_MapKeyConverts());
+ }
+
+ protected static Translator buildMapKeyForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.MAP_KEY_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlManyToMany_2_1_MapKeyForeignKey());
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java
index 002ed41..c1693b4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,7 +9,15 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.resource.orm;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlManyToOne_2_1;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -31,10 +39,20 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping
+public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implements XmlManyToOne_2_1
{
/**
+ * The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 foreignKey;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -55,6 +73,186 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping
return OrmPackage.Literals.XML_MANY_TO_ONE;
}
+ /**
+ * Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key</em>' containment reference.
+ * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToOne_2_1_ForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getForeignKey()
+ {
+ return foreignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ foreignKey = newForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY, oldForeignKey, newForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne#getForeignKey <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key</em>' containment reference.
+ * @see #getForeignKey()
+ * @generated
+ */
+ public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ {
+ if (newForeignKey != foreignKey)
+ {
+ NotificationChain msgs = null;
+ if (foreignKey != null)
+ msgs = ((InternalEObject)foreignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY, null, msgs);
+ if (newForeignKey != null)
+ msgs = ((InternalEObject)newForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY, null, msgs);
+ msgs = basicSetForeignKey(newForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY, newForeignKey, newForeignKey));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
+ return basicSetForeignKey(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
+ return getForeignKey();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
+ return foreignKey != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlManyToOne_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY: return OrmV2_1Package.XML_MANY_TO_ONE_21__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlManyToOne_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_MANY_TO_ONE_21__FOREIGN_KEY: return OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
// **************** XmlAttributeMapping impl ******************************
public String getMappingKey() {
@@ -78,8 +276,15 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping
buildMapsIdTranslator(),
buildIdTranslator(),
buildJoinColumnTranslator(),
+ buildForeignKeyTranslator(),
buildJoinTableTranslator(),
buildCascadeTranslator()
};
- }
+ }
+
+
+ protected static Translator buildForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlManyToOne_2_1_ForeignKey());
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedAttributeNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedAttributeNode.java
new file mode 100644
index 0000000..4593d3c
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedAttributeNode.java
@@ -0,0 +1,370 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Named Attribute Node</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlNamedAttributeNode extends EBaseObjectImpl implements XmlNamedAttributeNode_2_1
+{
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getSubgraph() <em>Subgraph</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSubgraph()
+ * @generated
+ * @ordered
+ */
+ protected static final String SUBGRAPH_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getSubgraph() <em>Subgraph</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSubgraph()
+ * @generated
+ * @ordered
+ */
+ protected String subgraph = SUBGRAPH_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getKeySubgraph() <em>Key Subgraph</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getKeySubgraph()
+ * @generated
+ * @ordered
+ */
+ protected static final String KEY_SUBGRAPH_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getKeySubgraph() <em>Key Subgraph</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getKeySubgraph()
+ * @generated
+ * @ordered
+ */
+ protected String keySubgraph = KEY_SUBGRAPH_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlNamedAttributeNode()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_NAMED_ATTRIBUTE_NODE;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode_2_1_Name()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_ATTRIBUTE_NODE__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Subgraph</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Subgraph</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Subgraph</em>' attribute.
+ * @see #setSubgraph(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode_2_1_Subgraph()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getSubgraph()
+ {
+ return subgraph;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode#getSubgraph <em>Subgraph</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Subgraph</em>' attribute.
+ * @see #getSubgraph()
+ * @generated
+ */
+ public void setSubgraph(String newSubgraph)
+ {
+ String oldSubgraph = subgraph;
+ subgraph = newSubgraph;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_ATTRIBUTE_NODE__SUBGRAPH, oldSubgraph, subgraph));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Key Subgraph</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Key Subgraph</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Key Subgraph</em>' attribute.
+ * @see #setKeySubgraph(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode_2_1_KeySubgraph()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getKeySubgraph()
+ {
+ return keySubgraph;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode#getKeySubgraph <em>Key Subgraph</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Key Subgraph</em>' attribute.
+ * @see #getKeySubgraph()
+ * @generated
+ */
+ public void setKeySubgraph(String newKeySubgraph)
+ {
+ String oldKeySubgraph = keySubgraph;
+ keySubgraph = newKeySubgraph;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_ATTRIBUTE_NODE__KEY_SUBGRAPH, oldKeySubgraph, keySubgraph));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__NAME:
+ return getName();
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__SUBGRAPH:
+ return getSubgraph();
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__KEY_SUBGRAPH:
+ return getKeySubgraph();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__SUBGRAPH:
+ setSubgraph((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__KEY_SUBGRAPH:
+ setKeySubgraph((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__SUBGRAPH:
+ setSubgraph(SUBGRAPH_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__KEY_SUBGRAPH:
+ setKeySubgraph(KEY_SUBGRAPH_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__SUBGRAPH:
+ return SUBGRAPH_EDEFAULT == null ? subgraph != null : !SUBGRAPH_EDEFAULT.equals(subgraph);
+ case OrmPackage.XML_NAMED_ATTRIBUTE_NODE__KEY_SUBGRAPH:
+ return KEY_SUBGRAPH_EDEFAULT == null ? keySubgraph != null : !KEY_SUBGRAPH_EDEFAULT.equals(keySubgraph);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(", subgraph: ");
+ result.append(subgraph);
+ result.append(", keySubgraph: ");
+ result.append(keySubgraph);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlNamedAttributeNode(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildSubgraphTranslator(),
+ buildKeySubgraphTranslator(),
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmV2_1Package.eINSTANCE.getXmlNamedAttributeNode_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildSubgraphTranslator() {
+ return new Translator(JPA2_1.SUBGRAPH, OrmV2_1Package.eINSTANCE.getXmlNamedAttributeNode_2_1_Subgraph(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildKeySubgraphTranslator() {
+ return new Translator(JPA2_1.KEY_SUBGRAPH, OrmV2_1Package.eINSTANCE.getXmlNamedAttributeNode_2_1_KeySubgraph(), Translator.DOM_ATTRIBUTE);
+ }
+
+} // XmlNamedAttributeNode
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java
new file mode 100644
index 0000000..31d32d1
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java
@@ -0,0 +1,477 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.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;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedEntityGraph_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Named Entity Graph</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEntityGraph_2_1
+{
+ /**
+ * The cached value of the '{@link #getNamedAttributeNodes() <em>Named Attribute Nodes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedAttributeNodes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedAttributeNode_2_1> namedAttributeNodes;
+
+ /**
+ * The cached value of the '{@link #getSubgraphs() <em>Subgraphs</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSubgraphs()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedSubgraph_2_1> subgraphs;
+
+ /**
+ * The cached value of the '{@link #getSubclassSubgraphs() <em>Subclass Subgraphs</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSubclassSubgraphs()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedSubgraph_2_1> subclassSubgraphs;
+
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getIncludeAllAttributes() <em>Include All Attributes</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIncludeAllAttributes()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean INCLUDE_ALL_ATTRIBUTES_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getIncludeAllAttributes() <em>Include All Attributes</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIncludeAllAttributes()
+ * @generated
+ * @ordered
+ */
+ protected Boolean includeAllAttributes = INCLUDE_ALL_ATTRIBUTES_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlNamedEntityGraph()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_NAMED_ENTITY_GRAPH;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Attribute Nodes</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>Named Attribute Nodes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph_2_1_NamedAttributeNodes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedAttributeNode_2_1> getNamedAttributeNodes()
+ {
+ if (namedAttributeNodes == null)
+ {
+ namedAttributeNodes = new EObjectContainmentEList<XmlNamedAttributeNode_2_1>(XmlNamedAttributeNode_2_1.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES);
+ }
+ return namedAttributeNodes;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Subgraphs</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Subgraphs</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>Subgraphs</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph_2_1_Subgraphs()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedSubgraph_2_1> getSubgraphs()
+ {
+ if (subgraphs == null)
+ {
+ subgraphs = new EObjectContainmentEList<XmlNamedSubgraph_2_1>(XmlNamedSubgraph_2_1.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS);
+ }
+ return subgraphs;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Subclass Subgraphs</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Subclass Subgraphs</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>Subclass Subgraphs</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph_2_1_SubclassSubgraphs()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedSubgraph_2_1> getSubclassSubgraphs()
+ {
+ if (subclassSubgraphs == null)
+ {
+ subclassSubgraphs = new EObjectContainmentEList<XmlNamedSubgraph_2_1>(XmlNamedSubgraph_2_1.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS);
+ }
+ return subclassSubgraphs;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph_2_1_Name()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_ENTITY_GRAPH__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Include All Attributes</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Include All Attributes</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Include All Attributes</em>' attribute.
+ * @see #setIncludeAllAttributes(Boolean)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph_2_1_IncludeAllAttributes()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getIncludeAllAttributes()
+ {
+ return includeAllAttributes;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph#getIncludeAllAttributes <em>Include All Attributes</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Include All Attributes</em>' attribute.
+ * @see #getIncludeAllAttributes()
+ * @generated
+ */
+ public void setIncludeAllAttributes(Boolean newIncludeAllAttributes)
+ {
+ Boolean oldIncludeAllAttributes = includeAllAttributes;
+ includeAllAttributes = newIncludeAllAttributes;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_ENTITY_GRAPH__INCLUDE_ALL_ATTRIBUTES, oldIncludeAllAttributes, includeAllAttributes));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES:
+ return ((InternalEList<?>)getNamedAttributeNodes()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS:
+ return ((InternalEList<?>)getSubgraphs()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS:
+ return ((InternalEList<?>)getSubclassSubgraphs()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES:
+ return getNamedAttributeNodes();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS:
+ return getSubgraphs();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS:
+ return getSubclassSubgraphs();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAME:
+ return getName();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__INCLUDE_ALL_ATTRIBUTES:
+ return getIncludeAllAttributes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES:
+ getNamedAttributeNodes().clear();
+ getNamedAttributeNodes().addAll((Collection<? extends XmlNamedAttributeNode_2_1>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS:
+ getSubgraphs().clear();
+ getSubgraphs().addAll((Collection<? extends XmlNamedSubgraph_2_1>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS:
+ getSubclassSubgraphs().clear();
+ getSubclassSubgraphs().addAll((Collection<? extends XmlNamedSubgraph_2_1>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__INCLUDE_ALL_ATTRIBUTES:
+ setIncludeAllAttributes((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES:
+ getNamedAttributeNodes().clear();
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS:
+ getSubgraphs().clear();
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS:
+ getSubclassSubgraphs().clear();
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__INCLUDE_ALL_ATTRIBUTES:
+ setIncludeAllAttributes(INCLUDE_ALL_ATTRIBUTES_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES:
+ return namedAttributeNodes != null && !namedAttributeNodes.isEmpty();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS:
+ return subgraphs != null && !subgraphs.isEmpty();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS:
+ return subclassSubgraphs != null && !subclassSubgraphs.isEmpty();
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_NAMED_ENTITY_GRAPH__INCLUDE_ALL_ATTRIBUTES:
+ return INCLUDE_ALL_ATTRIBUTES_EDEFAULT == null ? includeAllAttributes != null : !INCLUDE_ALL_ATTRIBUTES_EDEFAULT.equals(includeAllAttributes);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(", includeAllAttributes: ");
+ result.append(includeAllAttributes);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlNamedEntityGraph(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildIncludeAllAttributesTranslator(),
+ buildNamedAttributeNodeTranslator(),
+ buildSubgraphTranslator(),
+ buildSubclassSubgraphTranslator(),
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmV2_1Package.eINSTANCE.getXmlNamedEntityGraph_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildIncludeAllAttributesTranslator() {
+ return new Translator(JPA2_1.INCLUDE_ALL_ATTRIBUTES, OrmV2_1Package.eINSTANCE.getXmlNamedEntityGraph_2_1_IncludeAllAttributes(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildNamedAttributeNodeTranslator() {
+ return XmlNamedAttributeNode.buildTranslator(JPA2_1.NAMED_ATTRIBUTE_NODE, OrmV2_1Package.eINSTANCE.getXmlNamedEntityGraph_2_1_NamedAttributeNodes());
+ }
+
+ protected static Translator buildSubgraphTranslator() {
+ return XmlNamedSubgraph.buildTranslator(JPA2_1.SUBGRAPH, OrmV2_1Package.eINSTANCE.getXmlNamedEntityGraph_2_1_Subgraphs());
+ }
+
+ protected static Translator buildSubclassSubgraphTranslator() {
+ return XmlNamedSubgraph.buildTranslator(JPA2_1.SUBCLASS_SUBGRAPH, OrmV2_1Package.eINSTANCE.getXmlNamedEntityGraph_2_1_SubclassSubgraphs());
+ }
+
+} // XmlNamedEntityGraph
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java
index 56ca6fa..91d5715 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedNativeQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -41,6 +41,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
* <p>
* The following features are supported:
* <ul>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery#getQuery <em>Query</em>}</li>
* <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery#getResultClass <em>Result Class</em>}</li>
* <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}</li>
* </ul>
@@ -94,34 +95,34 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
protected String name = NAME_EDEFAULT;
/**
- * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.
+ * The cached value of the '{@link #getHints() <em>Hints</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getQuery()
+ * @see #getHints()
* @generated
* @ordered
*/
- protected static final String QUERY_EDEFAULT = null;
+ protected EList<XmlQueryHint> hints;
/**
- * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
+ * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getQuery()
* @generated
* @ordered
*/
- protected String query = QUERY_EDEFAULT;
+ protected static final String QUERY_EDEFAULT = null;
/**
- * The cached value of the '{@link #getHints() <em>Hints</em>}' containment reference list.
+ * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getHints()
+ * @see #getQuery()
* @generated
* @ordered
*/
- protected EList<XmlQueryHint> hints;
+ protected String query = QUERY_EDEFAULT;
/**
* The default value of the '{@link #getResultClass() <em>Result Class</em>}' attribute.
@@ -334,7 +335,7 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
* <!-- end-user-doc -->
* @return the value of the '<em>Query</em>' attribute.
* @see #setQuery(String)
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery_Query()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedNativeQuery_Query()
* @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* @generated
*/
@@ -412,10 +413,10 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
return getDescription();
case OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
return getName();
- case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
- return getQuery();
case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
return getHints();
+ case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
+ return getQuery();
case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
return getResultClass();
case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING:
@@ -441,13 +442,13 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
case OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
setName((String)newValue);
return;
- case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
- setQuery((String)newValue);
- return;
case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
getHints().clear();
getHints().addAll((Collection<? extends XmlQueryHint>)newValue);
return;
+ case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
+ setQuery((String)newValue);
+ return;
case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
setResultClass((String)newValue);
return;
@@ -474,12 +475,12 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
case OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
setName(NAME_EDEFAULT);
return;
- case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
- setQuery(QUERY_EDEFAULT);
- return;
case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
getHints().clear();
return;
+ case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
+ setQuery(QUERY_EDEFAULT);
+ return;
case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
setResultClass(RESULT_CLASS_EDEFAULT);
return;
@@ -504,10 +505,10 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
case OrmPackage.XML_NAMED_NATIVE_QUERY__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
- return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
case OrmPackage.XML_NAMED_NATIVE_QUERY__HINTS:
return hints != null && !hints.isEmpty();
+ case OrmPackage.XML_NAMED_NATIVE_QUERY__QUERY:
+ return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_CLASS:
return RESULT_CLASS_EDEFAULT == null ? resultClass != null : !RESULT_CLASS_EDEFAULT.equals(resultClass);
case OrmPackage.XML_NAMED_NATIVE_QUERY__RESULT_SET_MAPPING:
@@ -637,7 +638,7 @@ public class XmlNamedNativeQuery extends EBaseObjectImpl implements XmlQuery
}
protected static Translator buildQueryTranslator() {
- return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlQuery_Query());
+ return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlNamedNativeQuery_Query());
}
protected static Translator buildHintTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java
index dc73d1b..8388494 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -42,6 +42,12 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
* will almost certainly be broken (repeatedly) as the API evolves.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery#getQuery <em>Query</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedQuery()
* @model kind="class"
@@ -91,50 +97,50 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
protected String name = NAME_EDEFAULT;
/**
- * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.
+ * The cached value of the '{@link #getHints() <em>Hints</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getQuery()
+ * @see #getHints()
* @generated
* @ordered
*/
- protected static final String QUERY_EDEFAULT = null;
+ protected EList<XmlQueryHint> hints;
/**
- * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
+ * changed this to null and removed the generated flag so emf won't generate over it
+ * we don't want a default for enums, just null if the tag does not exist
+ */
+ protected static final LockModeType_2_0 LOCK_MODE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getLockMode() <em>Lock Mode</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getQuery()
+ * @see #getLockMode()
* @generated
* @ordered
*/
- protected String query = QUERY_EDEFAULT;
+ protected LockModeType_2_0 lockMode = LOCK_MODE_EDEFAULT;
/**
- * The cached value of the '{@link #getHints() <em>Hints</em>}' containment reference list.
+ * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getHints()
+ * @see #getQuery()
* @generated
* @ordered
*/
- protected EList<XmlQueryHint> hints;
-
- /**
- * changed this to null and removed the generated flag so emf won't generate over it
- * we don't want a default for enums, just null if the tag does not exist
- */
- protected static final LockModeType_2_0 LOCK_MODE_EDEFAULT = null;
+ protected static final String QUERY_EDEFAULT = null;
/**
- * The cached value of the '{@link #getLockMode() <em>Lock Mode</em>}' attribute.
+ * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getLockMode()
+ * @see #getQuery()
* @generated
* @ordered
*/
- protected LockModeType_2_0 lockMode = LOCK_MODE_EDEFAULT;
+ protected String query = QUERY_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -237,7 +243,7 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
* <!-- end-user-doc -->
* @return the value of the '<em>Query</em>' attribute.
* @see #setQuery(String)
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery_Query()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedQuery_Query()
* @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* @generated
*/
@@ -353,12 +359,12 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
return getDescription();
case OrmPackage.XML_NAMED_QUERY__NAME:
return getName();
- case OrmPackage.XML_NAMED_QUERY__QUERY:
- return getQuery();
case OrmPackage.XML_NAMED_QUERY__HINTS:
return getHints();
case OrmPackage.XML_NAMED_QUERY__LOCK_MODE:
return getLockMode();
+ case OrmPackage.XML_NAMED_QUERY__QUERY:
+ return getQuery();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -380,9 +386,6 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
case OrmPackage.XML_NAMED_QUERY__NAME:
setName((String)newValue);
return;
- case OrmPackage.XML_NAMED_QUERY__QUERY:
- setQuery((String)newValue);
- return;
case OrmPackage.XML_NAMED_QUERY__HINTS:
getHints().clear();
getHints().addAll((Collection<? extends XmlQueryHint>)newValue);
@@ -390,6 +393,9 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
case OrmPackage.XML_NAMED_QUERY__LOCK_MODE:
setLockMode((LockModeType_2_0)newValue);
return;
+ case OrmPackage.XML_NAMED_QUERY__QUERY:
+ setQuery((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -410,15 +416,15 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
case OrmPackage.XML_NAMED_QUERY__NAME:
setName(NAME_EDEFAULT);
return;
- case OrmPackage.XML_NAMED_QUERY__QUERY:
- setQuery(QUERY_EDEFAULT);
- return;
case OrmPackage.XML_NAMED_QUERY__HINTS:
getHints().clear();
return;
case OrmPackage.XML_NAMED_QUERY__LOCK_MODE:
setLockMode(LOCK_MODE_EDEFAULT);
return;
+ case OrmPackage.XML_NAMED_QUERY__QUERY:
+ setQuery(QUERY_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -437,12 +443,12 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
case OrmPackage.XML_NAMED_QUERY__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case OrmPackage.XML_NAMED_QUERY__QUERY:
- return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
case OrmPackage.XML_NAMED_QUERY__HINTS:
return hints != null && !hints.isEmpty();
case OrmPackage.XML_NAMED_QUERY__LOCK_MODE:
return lockMode != LOCK_MODE_EDEFAULT;
+ case OrmPackage.XML_NAMED_QUERY__QUERY:
+ return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
}
return super.eIsSet(featureID);
}
@@ -500,10 +506,10 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
result.append(description);
result.append(", name: ");
result.append(name);
- result.append(", query: ");
- result.append(query);
result.append(", lockMode: ");
result.append(lockMode);
+ result.append(", query: ");
+ result.append(query);
result.append(')');
return result.toString();
}
@@ -635,7 +641,7 @@ public class XmlNamedQuery extends EBaseObjectImpl implements XmlQuery, XmlNamed
}
protected static Translator buildQueryTranslator() {
- return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlQuery_Query());
+ return new Translator(JPA.QUERY, OrmPackage.eINSTANCE.getXmlNamedQuery_Query());
}
protected static Translator buildLockModeTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
new file mode 100644
index 0000000..aee5367
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
@@ -0,0 +1,641 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.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.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+import org.eclipse.jpt.common.core.utility.TextRange;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Named Stored Procedure Query</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlQuery, XmlNamedStoredProcedureQuery_2_1
+{
+ /**
+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected static final String DESCRIPTION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected String description = DESCRIPTION_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getHints() <em>Hints</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getHints()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlQueryHint> hints;
+
+ /**
+ * The cached value of the '{@link #getResultClasses() <em>Result Classes</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getResultClasses()
+ * @generated
+ * @ordered
+ */
+ protected EList<String> resultClasses;
+
+ /**
+ * The cached value of the '{@link #getResultSetMappings() <em>Result Set Mappings</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getResultSetMappings()
+ * @generated
+ * @ordered
+ */
+ protected EList<String> resultSetMappings;
+
+ /**
+ * The default value of the '{@link #getProcedureName() <em>Procedure Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getProcedureName()
+ * @generated
+ * @ordered
+ */
+ protected static final String PROCEDURE_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getProcedureName() <em>Procedure Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getProcedureName()
+ * @generated
+ * @ordered
+ */
+ protected String procedureName = PROCEDURE_NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParameters()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlStoredProcedureParameter_2_1> parameters;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlNamedStoredProcedureQuery()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_NAMED_STORED_PROCEDURE_QUERY;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Description</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Description</em>' attribute.
+ * @see #setDescription(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery_2_0_Description()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery#getDescription <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Description</em>' attribute.
+ * @see #getDescription()
+ * @generated
+ */
+ public void setDescription(String newDescription)
+ {
+ String oldDescription = description;
+ description = newDescription;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION, oldDescription, description));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery_Name()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Hints</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryHint}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Hints</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>Hints</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery_Hints()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlQueryHint> getHints()
+ {
+ if (hints == null)
+ {
+ hints = new EObjectContainmentEList<XmlQueryHint>(XmlQueryHint.class, this, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS);
+ }
+ return hints;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Result Classes</b></em>' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Result Classes</em>' attribute list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Result Classes</em>' attribute list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery_2_1_ResultClasses()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public EList<String> getResultClasses()
+ {
+ if (resultClasses == null)
+ {
+ resultClasses = new EDataTypeUniqueEList<String>(String.class, this, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES);
+ }
+ return resultClasses;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Result Set Mappings</b></em>' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Result Set Mappings</em>' attribute list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Result Set Mappings</em>' attribute list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery_2_1_ResultSetMappings()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public EList<String> getResultSetMappings()
+ {
+ if (resultSetMappings == null)
+ {
+ resultSetMappings = new EDataTypeUniqueEList<String>(String.class, this, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS);
+ }
+ return resultSetMappings;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Procedure Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Procedure Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Procedure Name</em>' attribute.
+ * @see #setProcedureName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery_2_1_ProcedureName()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getProcedureName()
+ {
+ return procedureName;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery#getProcedureName <em>Procedure Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Procedure Name</em>' attribute.
+ * @see #getProcedureName()
+ * @generated
+ */
+ public void setProcedureName(String newProcedureName)
+ {
+ String oldProcedureName = procedureName;
+ procedureName = newProcedureName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME, oldProcedureName, procedureName));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parameters</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Parameters</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery_2_1_Parameters()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlStoredProcedureParameter_2_1> getParameters()
+ {
+ if (parameters == null)
+ {
+ parameters = new EObjectContainmentEList<XmlStoredProcedureParameter_2_1>(XmlStoredProcedureParameter_2_1.class, this, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS);
+ }
+ return parameters;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
+ return ((InternalEList<?>)getHints()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
+ return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION:
+ return getDescription();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
+ return getName();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
+ return getHints();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES:
+ return getResultClasses();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS:
+ return getResultSetMappings();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
+ return getProcedureName();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
+ return getParameters();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION:
+ setDescription((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
+ getHints().clear();
+ getHints().addAll((Collection<? extends XmlQueryHint>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES:
+ getResultClasses().clear();
+ getResultClasses().addAll((Collection<? extends String>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS:
+ getResultSetMappings().clear();
+ getResultSetMappings().addAll((Collection<? extends String>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
+ setProcedureName((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
+ getParameters().clear();
+ getParameters().addAll((Collection<? extends XmlStoredProcedureParameter_2_1>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION:
+ setDescription(DESCRIPTION_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
+ getHints().clear();
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES:
+ getResultClasses().clear();
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS:
+ getResultSetMappings().clear();
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
+ setProcedureName(PROCEDURE_NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
+ getParameters().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION:
+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
+ return hints != null && !hints.isEmpty();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES:
+ return resultClasses != null && !resultClasses.isEmpty();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS:
+ return resultSetMappings != null && !resultSetMappings.isEmpty();
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
+ return PROCEDURE_NAME_EDEFAULT == null ? procedureName != null : !PROCEDURE_NAME_EDEFAULT.equals(procedureName);
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
+ return parameters != null && !parameters.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlNamedStoredProcedureQuery_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlNamedStoredProcedureQuery_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES;
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS;
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME;
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (description: ");
+ result.append(description);
+ result.append(", name: ");
+ result.append(name);
+ result.append(", resultClasses: ");
+ result.append(resultClasses);
+ result.append(", resultSetMappings: ");
+ result.append(resultSetMappings);
+ result.append(", procedureName: ");
+ result.append(procedureName);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ public TextRange getNameTextRange() {
+ return getAttributeTextRange(JPA.NAME);
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildProcedureNameTranslator(),
+ buildDescriptionTranslator(),
+ XmlStoredProcedureParameter.buildTranslator(JPA2_1.PARAMETER, OrmV2_1Package.eINSTANCE.getXmlNamedStoredProcedureQuery_2_1_Parameters()),
+ buildResultClassTranslator(),
+ buildResultSetMappingTranslator(),
+ XmlQueryHint.buildTranslator(JPA.HINT, OrmPackage.eINSTANCE.getXmlQuery_Hints()),
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlQuery_Name(), Translator.DOM_ATTRIBUTE);
+ }
+ protected static Translator buildProcedureNameTranslator() {
+ return new Translator(JPA2_1.PROCEDURE_NAME, OrmV2_1Package.eINSTANCE.getXmlNamedStoredProcedureQuery_2_1_ProcedureName(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildDescriptionTranslator() {
+ return new Translator(JPA.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlQuery_2_0_Description());
+ }
+
+ protected static Translator buildResultClassTranslator() {
+ return new Translator(JPA2_1.RESULT_CLASS, OrmV2_1Package.eINSTANCE.getXmlNamedStoredProcedureQuery_2_1_ResultClasses());
+ }
+
+ protected static Translator buildResultSetMappingTranslator() {
+ return new Translator(JPA2_1.RESULT_SET_MAPPING, OrmV2_1Package.eINSTANCE.getXmlNamedStoredProcedureQuery_2_1_ResultSetMappings());
+ }
+} // XmlNamedStoredProcedureQuery
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java
new file mode 100644
index 0000000..43b238f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java
@@ -0,0 +1,374 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.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;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Named Subgraph</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlNamedSubgraph extends EBaseObjectImpl implements XmlNamedSubgraph_2_1
+{
+ /**
+ * The cached value of the '{@link #getNamedAttributeNodes() <em>Named Attribute Nodes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNamedAttributeNodes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlNamedAttributeNode_2_1> namedAttributeNodes;
+
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassName()
+ * @generated
+ * @ordered
+ */
+ protected String className = CLASS_NAME_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlNamedSubgraph()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_NAMED_SUBGRAPH;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Named Attribute Nodes</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>Named Attribute Nodes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph_2_1_NamedAttributeNodes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlNamedAttributeNode_2_1> getNamedAttributeNodes()
+ {
+ if (namedAttributeNodes == null)
+ {
+ namedAttributeNodes = new EObjectContainmentEList<XmlNamedAttributeNode_2_1>(XmlNamedAttributeNode_2_1.class, this, OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES);
+ }
+ return namedAttributeNodes;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph_2_1_Name()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_SUBGRAPH__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Class Name</em>' attribute.
+ * @see #setClassName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph_2_1_ClassName()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getClassName()
+ {
+ return className;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph#getClassName <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Class Name</em>' attribute.
+ * @see #getClassName()
+ * @generated
+ */
+ public void setClassName(String newClassName)
+ {
+ String oldClassName = className;
+ className = newClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_NAMED_SUBGRAPH__CLASS_NAME, oldClassName, className));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES:
+ return ((InternalEList<?>)getNamedAttributeNodes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES:
+ return getNamedAttributeNodes();
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAME:
+ return getName();
+ case OrmPackage.XML_NAMED_SUBGRAPH__CLASS_NAME:
+ return getClassName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES:
+ getNamedAttributeNodes().clear();
+ getNamedAttributeNodes().addAll((Collection<? extends XmlNamedAttributeNode_2_1>)newValue);
+ return;
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_NAMED_SUBGRAPH__CLASS_NAME:
+ setClassName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES:
+ getNamedAttributeNodes().clear();
+ return;
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_NAMED_SUBGRAPH__CLASS_NAME:
+ setClassName(CLASS_NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES:
+ return namedAttributeNodes != null && !namedAttributeNodes.isEmpty();
+ case OrmPackage.XML_NAMED_SUBGRAPH__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_NAMED_SUBGRAPH__CLASS_NAME:
+ return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(", className: ");
+ result.append(className);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlNamedSubgraph(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildClassTranslator(),
+ buildNamedAttributeNodeTranslator()
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmV2_1Package.eINSTANCE.getXmlNamedSubgraph_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildClassTranslator() {
+ return new Translator(JPA.CLASS, OrmV2_1Package.eINSTANCE.getXmlNamedSubgraph_2_1_ClassName(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildNamedAttributeNodeTranslator() {
+ return XmlNamedAttributeNode.buildTranslator(JPA2_1.NAMED_ATTRIBUTE_NODE, OrmV2_1Package.eINSTANCE.getXmlNamedSubgraph_2_1_NamedAttributeNodes());
+ }
+
+} // XmlNamedSubgraph
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java
index 4563851..1333cc1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,6 +25,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOneToMany_2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlOneToMany_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -43,7 +48,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements XmlJoinColumnContainer, XmlOneToMany_2_0
+public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements XmlJoinColumnContainer, XmlOneToMany_2_0, XmlOneToMany_2_1
{
/**
@@ -76,6 +81,36 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
protected Boolean orphanRemoval = ORPHAN_REMOVAL_EDEFAULT;
/**
+ * The cached value of the '{@link #getMapKeyConverts() <em>Map Key Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> mapKeyConverts;
+
+ /**
+ * The cached value of the '{@link #getMapKeyForeignKey() <em>Map Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 mapKeyForeignKey;
+
+ /**
+ * The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 foreignKey;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -155,6 +190,149 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
}
/**
+ * Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Converts</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>Map Key Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany_2_1_MapKeyConverts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getMapKeyConverts()
+ {
+ if (mapKeyConverts == null)
+ {
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS);
+ }
+ return mapKeyConverts;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Map Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
+ * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany_2_1_MapKeyForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getMapKeyForeignKey()
+ {
+ return mapKeyForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldMapKeyForeignKey = mapKeyForeignKey;
+ mapKeyForeignKey = newMapKeyForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY, oldMapKeyForeignKey, newMapKeyForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany#getMapKeyForeignKey <em>Map Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Map Key Foreign Key</em>' containment reference.
+ * @see #getMapKeyForeignKey()
+ * @generated
+ */
+ public void setMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey)
+ {
+ if (newMapKeyForeignKey != mapKeyForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (mapKeyForeignKey != null)
+ msgs = ((InternalEObject)mapKeyForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY, null, msgs);
+ if (newMapKeyForeignKey != null)
+ msgs = ((InternalEObject)newMapKeyForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY, null, msgs);
+ msgs = basicSetMapKeyForeignKey(newMapKeyForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY, newMapKeyForeignKey, newMapKeyForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key</em>' containment reference.
+ * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany_2_1_ForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getForeignKey()
+ {
+ return foreignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ foreignKey = newForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY, oldForeignKey, newForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany#getForeignKey <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key</em>' containment reference.
+ * @see #getForeignKey()
+ * @generated
+ */
+ public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ {
+ if (newForeignKey != foreignKey)
+ {
+ NotificationChain msgs = null;
+ if (foreignKey != null)
+ msgs = ((InternalEObject)foreignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY, null, msgs);
+ if (newForeignKey != null)
+ msgs = ((InternalEObject)newForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY, null, msgs);
+ msgs = basicSetForeignKey(newForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY, newForeignKey, newForeignKey));
+ }
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -166,6 +344,12 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
{
case OrmPackage.XML_ONE_TO_MANY__JOIN_COLUMNS:
return ((InternalEList<?>)getJoinColumns()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS:
+ return ((InternalEList<?>)getMapKeyConverts()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ return basicSetMapKeyForeignKey(null, msgs);
+ case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
+ return basicSetForeignKey(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -184,6 +368,12 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
return getJoinColumns();
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
return getOrphanRemoval();
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS:
+ return getMapKeyConverts();
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ return getMapKeyForeignKey();
+ case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
+ return getForeignKey();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -206,6 +396,16 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
setOrphanRemoval((Boolean)newValue);
return;
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ setMapKeyForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -226,6 +426,15 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
setOrphanRemoval(ORPHAN_REMOVAL_EDEFAULT);
return;
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ return;
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ setMapKeyForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)null);
+ return;
}
super.eUnset(featureID);
}
@@ -244,6 +453,12 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
return joinColumns != null && !joinColumns.isEmpty();
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
return ORPHAN_REMOVAL_EDEFAULT == null ? orphanRemoval != null : !ORPHAN_REMOVAL_EDEFAULT.equals(orphanRemoval);
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS:
+ return mapKeyConverts != null && !mapKeyConverts.isEmpty();
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
+ return mapKeyForeignKey != null;
+ case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
+ return foreignKey != null;
}
return super.eIsSet(featureID);
}
@@ -279,6 +494,16 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
default: return -1;
}
}
+ if (baseClass == XmlOneToMany_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS: return OrmV2_1Package.XML_ONE_TO_MANY_21__MAP_KEY_CONVERTS;
+ case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY: return OrmV2_1Package.XML_ONE_TO_MANY_21__MAP_KEY_FOREIGN_KEY;
+ case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY: return OrmV2_1Package.XML_ONE_TO_MANY_21__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -313,6 +538,16 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
default: return -1;
}
}
+ if (baseClass == XmlOneToMany_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_ONE_TO_MANY_21__MAP_KEY_CONVERTS: return OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS;
+ case OrmV2_1Package.XML_ONE_TO_MANY_21__MAP_KEY_FOREIGN_KEY: return OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY;
+ case OrmV2_1Package.XML_ONE_TO_MANY_21__FOREIGN_KEY: return OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -358,10 +593,13 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
buildMapKeyTemporalTranslator(),
buildMapKeyEnumeratedTranslator(),
buildMapKeyAttributeOverrideTranslator(),
+ buildMapKeyConvertTranslator(),
buildMapKeyColumnTranslator(),
buildMapKeyJoinColumnTranslator(),
+ buildMapKeyForeignKeyTranslator(),
buildJoinTableTranslator(),
buildJoinColumnTranslator(),
+ buildForeignKeyTranslator(),
buildCascadeTranslator()
};
}
@@ -373,4 +611,17 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
protected static Translator buildJoinColumnTranslator() {
return XmlJoinColumn.buildTranslator(JPA.JOIN_COLUMN, OrmPackage.eINSTANCE.getXmlJoinColumnContainer_JoinColumns());
}
+
+ protected static Translator buildMapKeyConvertTranslator() {
+ return XmlConvert.buildTranslator(JPA2_1.MAP_KEY_CONVERT, OrmV2_1Package.eINSTANCE.getXmlOneToMany_2_1_MapKeyConverts());
+ }
+
+ protected static Translator buildMapKeyForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.MAP_KEY_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlOneToMany_2_1_MapKeyForeignKey());
+ }
+
+ protected static Translator buildForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlOneToMany_2_1_ForeignKey());
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java
index e11fe0f..c5ba31e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -26,6 +26,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOneToOne_2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlOneToOne_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -44,7 +49,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements XmlMappedByMapping, XmlPrimaryKeyJoinColumnContainer, XmlOneToOne_2_0
+public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements XmlMappedByMapping, XmlPrimaryKeyJoinColumnContainer, XmlOneToOne_2_0, XmlOneToOne_2_1
{
/**
@@ -94,6 +99,34 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
protected Boolean orphanRemoval = ORPHAN_REMOVAL_EDEFAULT;
/**
+ * The cached value of the '{@link #getMapKeyConverts() <em>Map Key Converts</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyConverts()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlConvert_2_1> mapKeyConverts;
+ /**
+ * The cached value of the '{@link #getPrimaryKeyForeignKey() <em>Primary Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPrimaryKeyForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 primaryKeyForeignKey;
+ /**
+ * The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 foreignKey;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -185,6 +218,149 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
}
/**
+ * Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Converts</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>Map Key Converts</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne_2_1_MapKeyConverts()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlConvert_2_1> getMapKeyConverts()
+ {
+ if (mapKeyConverts == null)
+ {
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS);
+ }
+ return mapKeyConverts;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Primary Key Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Primary Key Foreign Key</em>' containment reference.
+ * @see #setPrimaryKeyForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne_2_1_PrimaryKeyForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ {
+ return primaryKeyForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldPrimaryKeyForeignKey = primaryKeyForeignKey;
+ primaryKeyForeignKey = newPrimaryKeyForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY, oldPrimaryKeyForeignKey, newPrimaryKeyForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Primary Key Foreign Key</em>' containment reference.
+ * @see #getPrimaryKeyForeignKey()
+ * @generated
+ */
+ public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ {
+ if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (primaryKeyForeignKey != null)
+ msgs = ((InternalEObject)primaryKeyForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY, null, msgs);
+ if (newPrimaryKeyForeignKey != null)
+ msgs = ((InternalEObject)newPrimaryKeyForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY, null, msgs);
+ msgs = basicSetPrimaryKeyForeignKey(newPrimaryKeyForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY, newPrimaryKeyForeignKey, newPrimaryKeyForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Foreign Key</em>' containment reference.
+ * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne_2_1_ForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getForeignKey()
+ {
+ return foreignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ foreignKey = newForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY, oldForeignKey, newForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne#getForeignKey <em>Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Foreign Key</em>' containment reference.
+ * @see #getForeignKey()
+ * @generated
+ */
+ public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ {
+ if (newForeignKey != foreignKey)
+ {
+ NotificationChain msgs = null;
+ if (foreignKey != null)
+ msgs = ((InternalEObject)foreignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY, null, msgs);
+ if (newForeignKey != null)
+ msgs = ((InternalEObject)newForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY, null, msgs);
+ msgs = basicSetForeignKey(newForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY, newForeignKey, newForeignKey));
+ }
+
+ /**
* Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn}.
* <!-- begin-user-doc -->
@@ -219,6 +395,12 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
{
case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS:
return ((InternalEList<?>)getPrimaryKeyJoinColumns()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS:
+ return ((InternalEList<?>)getMapKeyConverts()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
+ return basicSetPrimaryKeyForeignKey(null, msgs);
+ case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
+ return basicSetForeignKey(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -239,6 +421,12 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
return getPrimaryKeyJoinColumns();
case OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL:
return getOrphanRemoval();
+ case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS:
+ return getMapKeyConverts();
+ case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
+ return getPrimaryKeyForeignKey();
+ case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
+ return getForeignKey();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -264,6 +452,16 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
case OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL:
setOrphanRemoval((Boolean)newValue);
return;
+ case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ return;
+ case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
+ setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -287,6 +485,15 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
case OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL:
setOrphanRemoval(ORPHAN_REMOVAL_EDEFAULT);
return;
+ case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS:
+ getMapKeyConverts().clear();
+ return;
+ case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
+ setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
+ setForeignKey((XmlForeignKey_2_1)null);
+ return;
}
super.eUnset(featureID);
}
@@ -307,6 +514,12 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
return primaryKeyJoinColumns != null && !primaryKeyJoinColumns.isEmpty();
case OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL:
return ORPHAN_REMOVAL_EDEFAULT == null ? orphanRemoval != null : !ORPHAN_REMOVAL_EDEFAULT.equals(orphanRemoval);
+ case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS:
+ return mapKeyConverts != null && !mapKeyConverts.isEmpty();
+ case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
+ return primaryKeyForeignKey != null;
+ case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
+ return foreignKey != null;
}
return super.eIsSet(featureID);
}
@@ -350,6 +563,16 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
default: return -1;
}
}
+ if (baseClass == XmlOneToOne_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS: return OrmV2_1Package.XML_ONE_TO_ONE_21__MAP_KEY_CONVERTS;
+ case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY: return OrmV2_1Package.XML_ONE_TO_ONE_21__PRIMARY_KEY_FOREIGN_KEY;
+ case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY: return OrmV2_1Package.XML_ONE_TO_ONE_21__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -392,6 +615,16 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
default: return -1;
}
}
+ if (baseClass == XmlOneToOne_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_ONE_TO_ONE_21__MAP_KEY_CONVERTS: return OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS;
+ case OrmV2_1Package.XML_ONE_TO_ONE_21__PRIMARY_KEY_FOREIGN_KEY: return OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY;
+ case OrmV2_1Package.XML_ONE_TO_ONE_21__FOREIGN_KEY: return OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -447,7 +680,9 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
buildMapsIdTranslator(),
buildIdTranslator(),
buildPrimaryKeyJoinColumnTranslator(),
+ buildPrimaryKeyForeignKeyTranslator(),
buildJoinColumnTranslator(),
+ buildForeignKeyTranslator(),
buildJoinTableTranslator(),
buildCascadeTranslator()
};
@@ -464,6 +699,15 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
protected static Translator buildPrimaryKeyJoinColumnTranslator() {
return XmlPrimaryKeyJoinColumn.buildTranslator(JPA.PRIMARY_KEY_JOIN_COLUMN, OrmPackage.eINSTANCE.getXmlPrimaryKeyJoinColumnContainer_PrimaryKeyJoinColumns());
}
+
+ protected static Translator buildForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlOneToOne_2_1_ForeignKey());
+ }
+
+ protected static Translator buildPrimaryKeyForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.PRIMARY_KEY_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlOneToOne_2_1_PrimaryKeyForeignKey());
+ }
+
// ********** content assist ***************
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQuery.java
index c992ed8..55d3732 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -28,7 +28,6 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlQuery_2_0;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getQuery <em>Query</em>}</li>
* <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getHints <em>Hints</em>}</li>
* </ul>
* </p>
@@ -66,45 +65,6 @@ public interface XmlQuery extends XmlQuery_2_0
void setName(String value);
/**
- * Returns the value of the '<em><b>Query</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Query</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Query</em>' attribute.
- * @see #setQuery(String)
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery_Query()
- * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
- * @generated
- */
- String getQuery();
-
- String getActualQuery();
-
- /**
- * Returns the value of the '<em><b>Query</b></em>' element, including the whitespace before the
- * JPQL query.
- */
- int getQueryOffset();
-
- /**
- * Determines whether the JPQL query is inside a CDATA section.
- */
- boolean isQueryInsideCDATASection();
-
- /**
- * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery#getQuery <em>Query</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Query</em>' attribute.
- * @see #getQuery()
- * @generated
- */
- void setQuery(String value);
-
- /**
* Returns the value of the '<em><b>Hints</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryHint}.
* <!-- begin-user-doc -->
@@ -121,6 +81,4 @@ public interface XmlQuery extends XmlQuery_2_0
EList<XmlQueryHint> getHints();
TextRange getNameTextRange();
-
- TextRange getQueryTextRange();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java
index 583e89a..c31e8eb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlQueryContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.resource.orm;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlQueryContainer_2_1;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
/**
@@ -27,10 +28,9 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
*
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer()
* @model kind="class" interface="true" abstract="true"
- * @extends EBaseObject
* @generated
*/
-public interface XmlQueryContainer extends EBaseObject
+public interface XmlQueryContainer extends XmlQueryContainer_2_1
{
/**
* Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java
index 6571012..46e4400 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -10,13 +10,20 @@
package org.eclipse.jpt.jpa.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.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlSecondaryTable_2_1;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -42,9 +49,27 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlSecondaryTable extends AbstractXmlTable
+public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryTable_2_1
{
/**
+ * The cached value of the '{@link #getPrimaryKeyForeignKey() <em>Primary Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getPrimaryKeyForeignKey()
+ * @generated
+ * @ordered
+ */
+ protected XmlForeignKey_2_1 primaryKeyForeignKey;
+ /**
+ * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIndexes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlIndex_2_1> indexes;
+ /**
* The cached value of the '{@link #getPrimaryKeyJoinColumns() <em>Primary Key Join Columns</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -76,6 +101,89 @@ public class XmlSecondaryTable extends AbstractXmlTable
}
/**
+ * Returns the value of the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Primary Key Foreign Key</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Primary Key Foreign Key</em>' containment reference.
+ * @see #setPrimaryKeyForeignKey(XmlForeignKey_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSecondaryTable_2_1_PrimaryKeyForeignKey()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ {
+ return primaryKeyForeignKey;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey, NotificationChain msgs)
+ {
+ XmlForeignKey_2_1 oldPrimaryKeyForeignKey = primaryKeyForeignKey;
+ primaryKeyForeignKey = newPrimaryKeyForeignKey;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY, oldPrimaryKeyForeignKey, newPrimaryKeyForeignKey);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSecondaryTable#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Primary Key Foreign Key</em>' containment reference.
+ * @see #getPrimaryKeyForeignKey()
+ * @generated
+ */
+ public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ {
+ if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
+ {
+ NotificationChain msgs = null;
+ if (primaryKeyForeignKey != null)
+ msgs = ((InternalEObject)primaryKeyForeignKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY, null, msgs);
+ if (newPrimaryKeyForeignKey != null)
+ msgs = ((InternalEObject)newPrimaryKeyForeignKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY, null, msgs);
+ msgs = basicSetPrimaryKeyForeignKey(newPrimaryKeyForeignKey, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY, newPrimaryKeyForeignKey, newPrimaryKeyForeignKey));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Indexes</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>Indexes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSecondaryTable_2_1_Indexes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlIndex_2_1> getIndexes()
+ {
+ if (indexes == null)
+ {
+ indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_SECONDARY_TABLE__INDEXES);
+ }
+ return indexes;
+ }
+
+ /**
* Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn}.
* <!-- begin-user-doc -->
@@ -108,6 +216,10 @@ public class XmlSecondaryTable extends AbstractXmlTable
{
switch (featureID)
{
+ case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
+ return basicSetPrimaryKeyForeignKey(null, msgs);
+ case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
+ return ((InternalEList<?>)getIndexes()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS:
return ((InternalEList<?>)getPrimaryKeyJoinColumns()).basicRemove(otherEnd, msgs);
}
@@ -124,6 +236,10 @@ public class XmlSecondaryTable extends AbstractXmlTable
{
switch (featureID)
{
+ case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
+ return getPrimaryKeyForeignKey();
+ case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
+ return getIndexes();
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS:
return getPrimaryKeyJoinColumns();
}
@@ -141,6 +257,13 @@ public class XmlSecondaryTable extends AbstractXmlTable
{
switch (featureID)
{
+ case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
+ setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ return;
+ case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
+ getIndexes().clear();
+ getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ return;
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS:
getPrimaryKeyJoinColumns().clear();
getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue);
@@ -159,6 +282,12 @@ public class XmlSecondaryTable extends AbstractXmlTable
{
switch (featureID)
{
+ case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
+ setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ return;
+ case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
+ getIndexes().clear();
+ return;
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS:
getPrimaryKeyJoinColumns().clear();
return;
@@ -176,12 +305,56 @@ public class XmlSecondaryTable extends AbstractXmlTable
{
switch (featureID)
{
+ case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
+ return primaryKeyForeignKey != null;
+ case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
+ return indexes != null && !indexes.isEmpty();
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS:
return primaryKeyJoinColumns != null && !primaryKeyJoinColumns.isEmpty();
}
return super.eIsSet(featureID);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlSecondaryTable_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY: return OrmV2_1Package.XML_SECONDARY_TABLE_21__PRIMARY_KEY_FOREIGN_KEY;
+ case OrmPackage.XML_SECONDARY_TABLE__INDEXES: return OrmV2_1Package.XML_SECONDARY_TABLE_21__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlSecondaryTable_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_SECONDARY_TABLE_21__PRIMARY_KEY_FOREIGN_KEY: return OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY;
+ case OrmV2_1Package.XML_SECONDARY_TABLE_21__INDEXES: return OrmPackage.XML_SECONDARY_TABLE__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
// ********** translators **********
public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
@@ -194,7 +367,9 @@ public class XmlSecondaryTable extends AbstractXmlTable
buildCatalogTranslator(),
buildSchemaTranslator(),
buildPrimaryKeyJoinColumnsTranslator(),
- buildUniqueConstraintTranslator()
+ buildPrimaryKeyForeignKeyTranslator(),
+ buildUniqueConstraintTranslator(),
+ buildIndexesTranslator()
};
}
@@ -202,4 +377,12 @@ public class XmlSecondaryTable extends AbstractXmlTable
return XmlPrimaryKeyJoinColumn.buildTranslator(JPA.PRIMARY_KEY_JOIN_COLUMN, OrmPackage.eINSTANCE.getXmlSecondaryTable_PrimaryKeyJoinColumns());
}
+ protected static Translator buildPrimaryKeyForeignKeyTranslator() {
+ return XmlForeignKey.buildTranslator(JPA2_1.PRIMARY_KEY_FOREIGN_KEY, OrmV2_1Package.eINSTANCE.getXmlSecondaryTable_2_1_PrimaryKeyForeignKey());
+ }
+
+ protected static Translator buildIndexesTranslator() {
+ return XmlIndex.buildTranslator(JPA2_1.INDEX, OrmV2_1Package.eINSTANCE.getXmlSecondaryTable_2_1_Indexes());
+ }
+
} // XmlSecondaryTableImpl
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java
index 3b5a694..1d671d3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/SqlResultSetMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -24,6 +24,10 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlSqlResultSetMapping_2_1;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -40,17 +44,17 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}</li>
- * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getEntityResults <em>Entity Results</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getColumnResults <em>Column Results</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getSqlResultSetMapping()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping()
* @model kind="class"
* @generated
*/
-public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResultSetMapping_2_0
+public class XmlSqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResultSetMapping_2_0, XmlSqlResultSetMapping_2_1
{
/**
* The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
@@ -73,6 +77,16 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
protected String description = DESCRIPTION_EDEFAULT;
/**
+ * The cached value of the '{@link #getConstructorResults() <em>Constructor Results</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConstructorResults()
+ * @generated
+ * @ordered
+ */
+ protected EList<ConstructorResult_2_1> constructorResults;
+
+ /**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -117,7 +131,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
* <!-- end-user-doc -->
* @generated
*/
- protected SqlResultSetMapping()
+ protected XmlSqlResultSetMapping()
{
super();
}
@@ -130,7 +144,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
@Override
protected EClass eStaticClass()
{
- return OrmPackage.Literals.SQL_RESULT_SET_MAPPING;
+ return OrmPackage.Literals.XML_SQL_RESULT_SET_MAPPING;
}
/**
@@ -153,7 +167,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
}
/**
- * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getDescription <em>Description</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Description</em>' attribute.
@@ -165,7 +179,30 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
String oldDescription = description;
description = newDescription;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.SQL_RESULT_SET_MAPPING__DESCRIPTION, oldDescription, description));
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SQL_RESULT_SET_MAPPING__DESCRIPTION, oldDescription, description));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Constructor Results</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Constructor Results</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>Constructor Results</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping_2_1_ConstructorResults()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<ConstructorResult_2_1> getConstructorResults()
+ {
+ if (constructorResults == null)
+ {
+ constructorResults = new EObjectContainmentEList<ConstructorResult_2_1>(ConstructorResult_2_1.class, this, OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS);
+ }
+ return constructorResults;
}
/**
@@ -178,7 +215,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getSqlResultSetMapping_Name()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping_Name()
* @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* @generated
*/
@@ -188,7 +225,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
}
/**
- * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSqlResultSetMapping#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
@@ -200,7 +237,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
String oldName = name;
name = newName;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.SQL_RESULT_SET_MAPPING__NAME, oldName, name));
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_SQL_RESULT_SET_MAPPING__NAME, oldName, name));
}
/**
@@ -213,7 +250,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Entity Results</em>' containment reference list.
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getSqlResultSetMapping_EntityResults()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping_EntityResults()
* @model containment="true"
* @generated
*/
@@ -221,7 +258,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
if (entityResults == null)
{
- entityResults = new EObjectContainmentEList<EntityResult>(EntityResult.class, this, OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS);
+ entityResults = new EObjectContainmentEList<EntityResult>(EntityResult.class, this, OrmPackage.XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS);
}
return entityResults;
}
@@ -236,7 +273,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Column Results</em>' containment reference list.
- * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getSqlResultSetMapping_ColumnResults()
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping_ColumnResults()
* @model containment="true"
* @generated
*/
@@ -244,7 +281,7 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
if (columnResults == null)
{
- columnResults = new EObjectContainmentEList<ColumnResult>(ColumnResult.class, this, OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS);
+ columnResults = new EObjectContainmentEList<ColumnResult>(ColumnResult.class, this, OrmPackage.XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS);
}
return columnResults;
}
@@ -259,9 +296,11 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
switch (featureID)
{
- case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS:
+ return ((InternalEList<?>)getConstructorResults()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
return ((InternalEList<?>)getEntityResults()).basicRemove(otherEnd, msgs);
- case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
return ((InternalEList<?>)getColumnResults()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -277,13 +316,15 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
switch (featureID)
{
- case OrmPackage.SQL_RESULT_SET_MAPPING__DESCRIPTION:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__DESCRIPTION:
return getDescription();
- case OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS:
+ return getConstructorResults();
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__NAME:
return getName();
- case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
return getEntityResults();
- case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
return getColumnResults();
}
return super.eGet(featureID, resolve, coreType);
@@ -300,17 +341,21 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
switch (featureID)
{
- case OrmPackage.SQL_RESULT_SET_MAPPING__DESCRIPTION:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__DESCRIPTION:
setDescription((String)newValue);
return;
- case OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS:
+ getConstructorResults().clear();
+ getConstructorResults().addAll((Collection<? extends ConstructorResult_2_1>)newValue);
+ return;
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__NAME:
setName((String)newValue);
return;
- case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
getEntityResults().clear();
getEntityResults().addAll((Collection<? extends EntityResult>)newValue);
return;
- case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
getColumnResults().clear();
getColumnResults().addAll((Collection<? extends ColumnResult>)newValue);
return;
@@ -328,16 +373,19 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
switch (featureID)
{
- case OrmPackage.SQL_RESULT_SET_MAPPING__DESCRIPTION:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__DESCRIPTION:
setDescription(DESCRIPTION_EDEFAULT);
return;
- case OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS:
+ getConstructorResults().clear();
+ return;
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__NAME:
setName(NAME_EDEFAULT);
return;
- case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
getEntityResults().clear();
return;
- case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
getColumnResults().clear();
return;
}
@@ -354,13 +402,15 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
{
switch (featureID)
{
- case OrmPackage.SQL_RESULT_SET_MAPPING__DESCRIPTION:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__DESCRIPTION:
return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
- case OrmPackage.SQL_RESULT_SET_MAPPING__NAME:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS:
+ return constructorResults != null && !constructorResults.isEmpty();
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case OrmPackage.SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__ENTITY_RESULTS:
return entityResults != null && !entityResults.isEmpty();
- case OrmPackage.SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__COLUMN_RESULTS:
return columnResults != null && !columnResults.isEmpty();
}
return super.eIsSet(featureID);
@@ -372,6 +422,44 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
* @generated
*/
@Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlSqlResultSetMapping_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS: return OrmV2_1Package.XML_SQL_RESULT_SET_MAPPING_21__CONSTRUCTOR_RESULTS;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlSqlResultSetMapping_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_SQL_RESULT_SET_MAPPING_21__CONSTRUCTOR_RESULTS: return OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public String toString()
{
if (eIsProxy()) return super.toString();
@@ -396,12 +484,13 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
buildNameTranslator(),
buildDescriptionTranslator(),
buildEntityResultTranslator(),
+ buildConstructorResultTranslator(),
buildColumnResultTranslator()
};
}
protected static Translator buildNameTranslator() {
- return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getSqlResultSetMapping_Name(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlSqlResultSetMapping_Name(), Translator.DOM_ATTRIBUTE);
}
protected static Translator buildDescriptionTranslator() {
@@ -409,10 +498,14 @@ public class SqlResultSetMapping extends EBaseObjectImpl implements XmlSqlResult
}
protected static Translator buildEntityResultTranslator() {
- return EntityResult.buildTranslator(JPA.ENTITY_RESULT, OrmPackage.eINSTANCE.getSqlResultSetMapping_EntityResults());
+ return EntityResult.buildTranslator(JPA.ENTITY_RESULT, OrmPackage.eINSTANCE.getXmlSqlResultSetMapping_EntityResults());
}
+ protected static Translator buildConstructorResultTranslator() {
+ return ConstructorResult.buildTranslator(JPA2_1.CONSTRUCTOR_RESULT, OrmV2_1Package.eINSTANCE.getXmlSqlResultSetMapping_2_1_ConstructorResults());
+ }
+
protected static Translator buildColumnResultTranslator() {
- return ColumnResult.buildTranslator(JPA.COLUMN_RESULT, OrmPackage.eINSTANCE.getSqlResultSetMapping_ColumnResults());
+ return ColumnResult.buildTranslator(JPA.COLUMN_RESULT, OrmPackage.eINSTANCE.getXmlSqlResultSetMapping_ColumnResults());
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java
new file mode 100644
index 0000000..198842f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java
@@ -0,0 +1,445 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1;
+import org.eclipse.wst.common.internal.emf.resource.Translator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Stored Procedure Parameter</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlStoredProcedureParameter_2_1
+{
+ /**
+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected static final String DESCRIPTION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected String description = DESCRIPTION_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParameterMode()
+ * @generated
+ * @ordered
+ */
+ protected static final ParameterMode_2_1 PARAMETER_MODE_EDEFAULT = ParameterMode_2_1.IN;
+
+ /**
+ * The cached value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParameterMode()
+ * @generated
+ * @ordered
+ */
+ protected ParameterMode_2_1 parameterMode = PARAMETER_MODE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassName()
+ * @generated
+ * @ordered
+ */
+ protected static final String CLASS_NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getClassName()
+ * @generated
+ * @ordered
+ */
+ protected String className = CLASS_NAME_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected XmlStoredProcedureParameter()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return OrmPackage.Literals.XML_STORED_PROCEDURE_PARAMETER;
+ }
+
+ /**
+ * Returns the value of the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Description</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Description</em>' attribute.
+ * @see #setDescription(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_Description()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getDescription()
+ {
+ return description;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getDescription <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Description</em>' attribute.
+ * @see #getDescription()
+ * @generated
+ */
+ public void setDescription(String newDescription)
+ {
+ String oldDescription = description;
+ description = newDescription;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION, oldDescription, description));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Parameter Mode</b></em>' attribute.
+ * The literals are from the enumeration {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parameter Mode</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Parameter Mode</em>' attribute.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1
+ * @see #setParameterMode(ParameterMode_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_ParameterMode()
+ * @model
+ * @generated
+ */
+ public ParameterMode_2_1 getParameterMode()
+ {
+ return parameterMode;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getParameterMode <em>Parameter Mode</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Parameter Mode</em>' attribute.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1
+ * @see #getParameterMode()
+ * @generated
+ */
+ public void setParameterMode(ParameterMode_2_1 newParameterMode)
+ {
+ ParameterMode_2_1 oldParameterMode = parameterMode;
+ parameterMode = newParameterMode == null ? PARAMETER_MODE_EDEFAULT : newParameterMode;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE, oldParameterMode, parameterMode));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_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.core.resource.orm.XmlStoredProcedureParameter#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME, oldName, name));
+ }
+
+ /**
+ * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Class Name</em>' attribute.
+ * @see #setClassName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_ClassName()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ public String getClassName()
+ {
+ return className;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getClassName <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Class Name</em>' attribute.
+ * @see #getClassName()
+ * @generated
+ */
+ public void setClassName(String newClassName)
+ {
+ String oldClassName = className;
+ className = newClassName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME, oldClassName, className));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
+ return getDescription();
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
+ return getParameterMode();
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
+ return getName();
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME:
+ return getClassName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
+ setDescription((String)newValue);
+ return;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
+ setParameterMode((ParameterMode_2_1)newValue);
+ return;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
+ setName((String)newValue);
+ return;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME:
+ setClassName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
+ setDescription(DESCRIPTION_EDEFAULT);
+ return;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
+ setParameterMode(PARAMETER_MODE_EDEFAULT);
+ return;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME:
+ setClassName(CLASS_NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION:
+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE:
+ return parameterMode != PARAMETER_MODE_EDEFAULT;
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME:
+ return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (description: ");
+ result.append(description);
+ result.append(", parameterMode: ");
+ result.append(parameterMode);
+ result.append(", name: ");
+ result.append(name);
+ result.append(", className: ");
+ result.append(className);
+ result.append(')');
+ return result.toString();
+ }
+
+
+ // ********** translators **********
+
+ public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
+ return new SimpleTranslator(
+ elementName,
+ structuralFeature,
+ OrmPackage.eINSTANCE.getXmlStoredProcedureParameter(),
+ buildTranslatorChildren()
+ );
+ }
+
+ private static Translator[] buildTranslatorChildren() {
+ return new Translator[] {
+ buildNameTranslator(),
+ buildClassTranslator(),
+ buildDescriptionTranslator(),
+ buildParameterModeTranslator(),
+ };
+ }
+
+ protected static Translator buildNameTranslator() {
+ return new Translator(JPA.NAME, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildClassTranslator() {
+ return new Translator(JPA.CLASS, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_ClassName(), Translator.DOM_ATTRIBUTE);
+ }
+
+ protected static Translator buildDescriptionTranslator() {
+ return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_Description());
+ }
+
+ protected static Translator buildParameterModeTranslator() {
+ return new Translator(JPA2_1.PARAMETER_MODE, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_ParameterMode());
+ }
+} // XmlStoredProcedureParameter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java
index 76c9db8..57df6e6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,7 +9,17 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.resource.orm;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlTable_2_1;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -30,9 +40,19 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlTable extends AbstractXmlTable
+public class XmlTable extends AbstractXmlTable implements XmlTable_2_1
{
/**
+ * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIndexes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlIndex_2_1> indexes;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -53,6 +73,151 @@ public class XmlTable extends AbstractXmlTable
return OrmPackage.Literals.XML_TABLE;
}
+ /**
+ * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Indexes</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>Indexes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTable_2_1_Indexes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlIndex_2_1> getIndexes()
+ {
+ if (indexes == null)
+ {
+ indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_TABLE__INDEXES);
+ }
+ return indexes;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_TABLE__INDEXES:
+ return ((InternalEList<?>)getIndexes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_TABLE__INDEXES:
+ return getIndexes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_TABLE__INDEXES:
+ getIndexes().clear();
+ getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_TABLE__INDEXES:
+ getIndexes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case OrmPackage.XML_TABLE__INDEXES:
+ return indexes != null && !indexes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlTable_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_TABLE__INDEXES: return OrmV2_1Package.XML_TABLE_21__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlTable_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_TABLE_21__INDEXES: return OrmPackage.XML_TABLE__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
// ********** translators **********
public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
@@ -64,8 +229,13 @@ public class XmlTable extends AbstractXmlTable
buildNameTranslator(),
buildCatalogTranslator(),
buildSchemaTranslator(),
- buildUniqueConstraintTranslator()
+ buildUniqueConstraintTranslator(),
+ buildIndexesTranslator()
};
}
+ protected static Translator buildIndexesTranslator() {
+ return XmlIndex.buildTranslator(JPA2_1.INDEX, OrmV2_1Package.eINSTANCE.getXmlTable_2_1_Indexes());
+ }
+
} // Table
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
index 6140e6b..b8214af 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -21,6 +21,10 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlTableGenerator_2_1;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -53,7 +57,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
+public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator, XmlTableGenerator_2_1
{
/**
* The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
@@ -136,6 +140,16 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
protected Integer allocationSize = ALLOCATION_SIZE_EDEFAULT;
/**
+ * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getIndexes()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlIndex_2_1> indexes;
+
+ /**
* The default value of the '{@link #getTable() <em>Table</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -637,6 +651,29 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
}
/**
+ * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Indexes</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>Indexes</em>' containment reference list.
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTableGenerator_2_1_Indexes()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlIndex_2_1> getIndexes()
+ {
+ if (indexes == null)
+ {
+ indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_TABLE_GENERATOR__INDEXES);
+ }
+ return indexes;
+ }
+
+ /**
* Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint}.
* <!-- begin-user-doc -->
@@ -669,6 +706,8 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
{
switch (featureID)
{
+ case OrmPackage.XML_TABLE_GENERATOR__INDEXES:
+ return ((InternalEList<?>)getIndexes()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS:
return ((InternalEList<?>)getUniqueConstraints()).basicRemove(otherEnd, msgs);
}
@@ -693,6 +732,8 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
return getInitialValue();
case OrmPackage.XML_TABLE_GENERATOR__ALLOCATION_SIZE:
return getAllocationSize();
+ case OrmPackage.XML_TABLE_GENERATOR__INDEXES:
+ return getIndexes();
case OrmPackage.XML_TABLE_GENERATOR__TABLE:
return getTable();
case OrmPackage.XML_TABLE_GENERATOR__CATALOG:
@@ -734,6 +775,10 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
case OrmPackage.XML_TABLE_GENERATOR__ALLOCATION_SIZE:
setAllocationSize((Integer)newValue);
return;
+ case OrmPackage.XML_TABLE_GENERATOR__INDEXES:
+ getIndexes().clear();
+ getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ return;
case OrmPackage.XML_TABLE_GENERATOR__TABLE:
setTable((String)newValue);
return;
@@ -782,6 +827,9 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
case OrmPackage.XML_TABLE_GENERATOR__ALLOCATION_SIZE:
setAllocationSize(ALLOCATION_SIZE_EDEFAULT);
return;
+ case OrmPackage.XML_TABLE_GENERATOR__INDEXES:
+ getIndexes().clear();
+ return;
case OrmPackage.XML_TABLE_GENERATOR__TABLE:
setTable(TABLE_EDEFAULT);
return;
@@ -825,6 +873,8 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
return INITIAL_VALUE_EDEFAULT == null ? initialValue != null : !INITIAL_VALUE_EDEFAULT.equals(initialValue);
case OrmPackage.XML_TABLE_GENERATOR__ALLOCATION_SIZE:
return ALLOCATION_SIZE_EDEFAULT == null ? allocationSize != null : !ALLOCATION_SIZE_EDEFAULT.equals(allocationSize);
+ case OrmPackage.XML_TABLE_GENERATOR__INDEXES:
+ return indexes != null && !indexes.isEmpty();
case OrmPackage.XML_TABLE_GENERATOR__TABLE:
return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
case OrmPackage.XML_TABLE_GENERATOR__CATALOG:
@@ -849,6 +899,44 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
* @generated
*/
@Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlTableGenerator_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_TABLE_GENERATOR__INDEXES: return OrmV2_1Package.XML_TABLE_GENERATOR_21__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlTableGenerator_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_TABLE_GENERATOR_21__INDEXES: return OrmPackage.XML_TABLE_GENERATOR__INDEXES;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public String toString()
{
if (eIsProxy()) return super.toString();
@@ -901,7 +989,8 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
buildInitialValueTranslator(),
buildAllocationSizeTranslator(),
buildDescriptionTranslator(),
- XmlUniqueConstraint.buildTranslator(JPA.UNIQUE_CONSTRAINT, OrmPackage.eINSTANCE.getXmlTableGenerator_UniqueConstraints())
+ XmlUniqueConstraint.buildTranslator(JPA.UNIQUE_CONSTRAINT, OrmPackage.eINSTANCE.getXmlTableGenerator_UniqueConstraints()),
+ buildIndexesTranslator()
};
}
@@ -944,6 +1033,10 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator
protected static Translator buildDescriptionTranslator() {
return new Translator(JPA.DESCRIPTION, OrmV2_0Package.eINSTANCE.getXmlGenerator_2_0_Description());
}
+
+ protected static Translator buildIndexesTranslator() {
+ return XmlIndex.buildTranslator(JPA2_1.INDEX, OrmV2_1Package.eINSTANCE.getXmlTableGenerator_2_1_Indexes());
+ }
// ************* content assist ***************
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java
index d4b466b..de81c7b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -15,6 +15,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -48,6 +51,15 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
*/
protected XmlColumn column;
/**
+ * The cached value of the '{@link #getConvert() <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConvert()
+ * @generated
+ * @ordered
+ */
+ protected XmlConvert_2_1 convert;
+ /**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -181,6 +193,66 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
}
/**
+ * Returns the value of the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Convert</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Convert</em>' containment reference.
+ * @see #setConvert(XmlConvert_2_1)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlConvert_2_1 getConvert()
+ {
+ return convert;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ {
+ XmlConvert_2_1 oldConvert = convert;
+ convert = newConvert;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_VERSION__CONVERT, oldConvert, newConvert);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlVersion#getConvert <em>Convert</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Convert</em>' containment reference.
+ * @see #getConvert()
+ * @generated
+ */
+ public void setConvert(XmlConvert_2_1 newConvert)
+ {
+ if (newConvert != convert)
+ {
+ NotificationChain msgs = null;
+ if (convert != null)
+ msgs = ((InternalEObject)convert).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_VERSION__CONVERT, null, msgs);
+ if (newConvert != null)
+ msgs = ((InternalEObject)newConvert).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_VERSION__CONVERT, null, msgs);
+ msgs = basicSetConvert(newConvert, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_VERSION__CONVERT, newConvert, newConvert));
+ }
+
+ /**
* Returns the value of the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -303,6 +375,8 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
{
case OrmPackage.XML_VERSION__COLUMN:
return basicSetColumn(null, msgs);
+ case OrmPackage.XML_VERSION__CONVERT:
+ return basicSetConvert(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -319,6 +393,8 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
{
case OrmPackage.XML_VERSION__COLUMN:
return getColumn();
+ case OrmPackage.XML_VERSION__CONVERT:
+ return getConvert();
case OrmPackage.XML_VERSION__LOB:
return isLob();
case OrmPackage.XML_VERSION__TEMPORAL:
@@ -342,6 +418,9 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
case OrmPackage.XML_VERSION__COLUMN:
setColumn((XmlColumn)newValue);
return;
+ case OrmPackage.XML_VERSION__CONVERT:
+ setConvert((XmlConvert_2_1)newValue);
+ return;
case OrmPackage.XML_VERSION__LOB:
setLob((Boolean)newValue);
return;
@@ -368,6 +447,9 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
case OrmPackage.XML_VERSION__COLUMN:
setColumn((XmlColumn)null);
return;
+ case OrmPackage.XML_VERSION__CONVERT:
+ setConvert((XmlConvert_2_1)null);
+ return;
case OrmPackage.XML_VERSION__LOB:
setLob(LOB_EDEFAULT);
return;
@@ -393,6 +475,8 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
{
case OrmPackage.XML_VERSION__COLUMN:
return column != null;
+ case OrmPackage.XML_VERSION__CONVERT:
+ return convert != null;
case OrmPackage.XML_VERSION__LOB:
return lob != LOB_EDEFAULT;
case OrmPackage.XML_VERSION__TEMPORAL:
@@ -419,6 +503,14 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
default: return -1;
}
}
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_VERSION__CONVERT: return OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (derivedFeatureID)
@@ -448,6 +540,14 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
default: return -1;
}
}
+ if (baseClass == XmlConvertibleMapping_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_CONVERTIBLE_MAPPING_21__CONVERT: return OrmPackage.XML_VERSION__CONVERT;
+ default: return -1;
+ }
+ }
if (baseClass == XmlConvertibleMapping.class)
{
switch (baseFeatureID)
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java
index ebcb3be..8197824 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_0/OrmV2_0Package.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -335,6 +335,15 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_DERIVED_ID_20_FEATURE_COUNT = 1;
/**
+ * The feature id for the '<em><b>Convert</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ELEMENT_COLLECTION_20__CONVERT = OrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
+
+ /**
* The feature id for the '<em><b>Lob</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ColumnResult_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ColumnResult_2_1.java
new file mode 100644
index 0000000..c4f39c8
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ColumnResult_2_1.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm.v2_1;
+
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Column Result 21</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1#getClassName <em>Class Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getColumnResult_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends EBaseObject
+ * @generated
+ */
+public interface ColumnResult_2_1 extends EBaseObject
+{
+ /**
+ * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Class Name</em>' attribute.
+ * @see #setClassName(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getColumnResult_2_1_ClassName()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ String getClassName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1#getClassName <em>Class Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Class Name</em>' attribute.
+ * @see #getClassName()
+ * @generated
+ */
+ void setClassName(String value);
+
+} // ColumnResult_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
new file mode 100644
index 0000000..432f7db
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.core.resource.orm.v2_1;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constructor Result 21</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getTargetClass <em>Target Class</em>}</li>
+ * <li>{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getColumnResults <em>Column Results</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getConstructorResult_2_1()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends EBaseObject
+ * @generated
+ */
+public interface ConstructorResult_2_1 extends EBaseObject
+{
+ /**
+ * Returns the value of the '<em><b>Target Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Target Class</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Target Class</em>' attribute.
+ * @see #setTargetClass(String)
+ * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getConstructorResult_2_1_TargetClass()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @generated
+ */
+ String getTargetClass();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1#getTargetClass <em>Target Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Target Class</em>' attribute.
+ * @see #getTargetClass()
+ * @generated
+ */
+ void setTargetClass(String value);
+
+ /**
+ * Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Column Results&