Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-02-26 19:25:54 +0000
committerkmoore2010-02-26 19:25:54 +0000
commit2bdbd3c1e923452896eb7092020da426c7fe9ef9 (patch)
tree0324078d5de311f86b20de3185610ae7f4e7dae0
parent6034d66760714396905a0a35cde7eae62afab555 (diff)
downloadwebtools.dali-2bdbd3c1e923452896eb7092020da426c7fe9ef9.tar.gz
webtools.dali-2bdbd3c1e923452896eb7092020da426c7fe9ef9.tar.xz
webtools.dali-2bdbd3c1e923452896eb7092020da426c7fe9ef9.zip
303547, 303548 - xml resource model support for map-key-attribute-overrides, map-key-association-overrides
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel31
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/model/orm.ecore51
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverrideContainer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverrideContainer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXmlContextNodeFactory.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java13
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java19
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java109
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java374
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java117
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java576
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer2_0.java60
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel4
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore11
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/VirtualEclipseLinkXmlElementCollection2_0.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java72
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java110
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java112
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java107
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java162
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer2_0.java60
35 files changed, 1260 insertions, 936 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
index b1ab9678c1..273f012c9d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
@@ -268,6 +268,9 @@
<genClasses image="false" ecoreClass="orm.ecore#//XmlOneToOne">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//XmlOneToOne/primaryKeyJoinColumns"/>
</genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//XmlOrderable">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlOrderable/orderBy"/>
+ </genClasses>
<genClasses ecoreClass="orm.ecore#//XmlOrderColumn"/>
<genClasses ecoreClass="orm.ecore#//XmlPersistenceUnitDefaults">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlPersistenceUnitDefaults/schema"/>
@@ -337,9 +340,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlUniqueConstraint/columnNames"/>
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//XmlVersion"/>
- <genClasses image="false" ecoreClass="orm.ecore#//XmlOrderable">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlOrderable/orderBy"/>
- </genClasses>
<nestedGenPackages prefix="OrmV2_0" basePackage="org.eclipse.jpt.core.resource.orm"
disposableProviderFactory="true" adapterFactory="false" ecorePackage="orm.ecore#//v2_0">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//v2_0/LockModeType_2_0">
@@ -352,11 +352,11 @@
<genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_WRITE"/>
<genEnumLiterals ecoreEnumLiteral="orm.ecore#//v2_0/LockModeType_2_0/PESSIMISTIC_FORCE_INCREMENT"/>
</genEnums>
- <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAttributeMapping_2_0"/>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAssociationOverride_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlAssociationOverride_2_0/description"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlAssociationOverride_2_0/joinTable"/>
</genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAttributeMapping_2_0"/>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlAttributeOverride_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlAttributeOverride_2_0/description"/>
</genClasses>
@@ -364,6 +364,9 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlAttributes_2_0/description"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlAttributes_2_0/elementCollections"/>
</genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCacheable_2_0">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCacheable_2_0/cacheable"/>
+ </genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCollectionTable_2_0"/>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlDerivedId_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlDerivedId_2_0/id"/>
@@ -375,7 +378,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyClass"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyTemporal"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyEnumerated"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyAttributeOverrides"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyColumn"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyJoinColumns"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/column"/>
@@ -393,6 +395,9 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlGenerator_2_0/description"/>
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlManyToMany_2_0"/>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer2_0">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMapKeyAttributeOverrideContainer2_0/mapKeyAttributeOverrides"/>
+ </genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlMapKeyClass_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMapKeyClass_2_0/className"/>
</genClasses>
@@ -403,7 +408,6 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyClass"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyTemporal"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyEnumerated"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyAttributeOverrides"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyColumn"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlMultiRelationshipMapping_2_0/mapKeyJoinColumns"/>
</genClasses>
@@ -412,11 +416,17 @@
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOneToMany_2_0"/>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOneToOne_2_0"/>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrderable_2_0">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlOrderable_2_0/orderColumn"/>
+ </genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrderColumn_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/nullable"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/insertable"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrderColumn_2_0/updatable"/>
</genClasses>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrphanRemovable_2_0">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrphanRemovable_2_0/orphanRemoval"/>
+ </genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0/description"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlPersistenceUnitDefaults_2_0/delimitedIdentifiers"/>
@@ -441,15 +451,6 @@
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlUniqueConstraint_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlUniqueConstraint_2_0/name"/>
</genClasses>
- <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCacheable_2_0">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCacheable_2_0/cacheable"/>
- </genClasses>
- <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrphanRemovable_2_0">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrphanRemovable_2_0/orphanRemoval"/>
- </genClasses>
- <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrderable_2_0">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlOrderable_2_0/orderColumn"/>
- </genClasses>
</nestedGenPackages>
</genPackages>
<genPackages prefix="Persistence" basePackage="org.eclipse.jpt.core.resource" disposableProviderFactory="true"
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
index ba0b73f47e..a06d2c2971 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
@@ -299,6 +299,10 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns"
upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/>
</eClassifiers>
+ <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"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn" eSuperTypes="#//AbstractXmlNamedColumn #//v2_0/XmlOrderColumn_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults" eSuperTypes="#//XmlAccessHolder #//v2_0/XmlPersistenceUnitDefaults_2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -384,10 +388,6 @@
lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping"/>
- <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"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="AccessType">
<eLiterals name="PROPERTY"/>
<eLiterals name="FIELD" value="1"/>
@@ -422,14 +422,14 @@
<eLiterals name="TIMESTAMP" value="2"/>
</eClassifiers>
<eSubpackages name="v2_0" nsURI="jpt.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.core.resource.orm.v2_0">
- <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeMapping_2_0" abstract="true"
- interface="true" eSuperTypes="#//XmlAccessHolder"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride_2_0" 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:EReference" name="joinTable" eType="#//XmlJoinTable"
containment="true" resolveProxies="false"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeMapping_2_0" abstract="true"
+ interface="true" eSuperTypes="#//XmlAccessHolder"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlAttributeOverride_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -440,6 +440,10 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="elementCollections" upperBound="-1"
eType="#//XmlElementCollection" containment="true" resolveProxies="false"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlCacheable_2_0" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable_2_0" abstract="true"
interface="true" eSuperTypes="#//XmlReferenceTable"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlDerivedId_2_0" abstract="true"
@@ -447,7 +451,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true"
- interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer">
+ interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable #//XmlAttributeOverrideContainer #//XmlAssociationOverrideContainer #//v2_0/XmlMapKeyAttributeOverrideContainer2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"
@@ -456,8 +460,6 @@
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyTemporal" eType="#//TemporalType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyEnumerated" eType="#//EnumType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAttributeOverrides"
- upperBound="-1" eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyColumn" eType="#//XmlColumn"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyJoinColumns" upperBound="-1"
@@ -485,6 +487,11 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true"
interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAttributeOverrideContainer2_0"
+ abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAttributeOverrides"
+ upperBound="-1" eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyClass_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
@@ -494,13 +501,11 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mapsId" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMultiRelationshipMapping_2_0" abstract="true"
- interface="true" eSuperTypes="#//v2_0/XmlOrderable_2_0">
+ interface="true" eSuperTypes="#//v2_0/XmlOrderable_2_0 #//v2_0/XmlMapKeyAttributeOverrideContainer2_0">
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlMapKeyClass"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyTemporal" eType="#//TemporalType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyEnumerated" eType="#//EnumType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAttributeOverrides"
- upperBound="-1" eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyColumn" eType="#//XmlColumn"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyJoinColumns" upperBound="-1"
@@ -514,12 +519,21 @@
interface="true" eSuperTypes="#//v2_0/XmlMultiRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_0" abstract="true" interface="true"
eSuperTypes="#//v2_0/XmlSingleRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOrderable_2_0" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="orderColumn" eType="#//XmlOrderColumn"
+ containment="true" resolveProxies="false"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="nullable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="insertable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="updatable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOrphanRemovable_2_0" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="orphanRemoval" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -562,18 +576,5 @@
<eLiterals name="PESSIMISTIC_WRITE" value="6"/>
<eLiterals name="PESSIMISTIC_FORCE_INCREMENT" value="7"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlCacheable_2_0" abstract="true"
- interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlOrphanRemovable_2_0" abstract="true"
- interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="orphanRemoval" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlOrderable_2_0" abstract="true"
- interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="orderColumn" eType="#//XmlOrderColumn"
- containment="true" resolveProxies="false"/>
- </eClassifiers>
</eSubpackages>
</ecore:EPackage>
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverrideContainer.java
index 6e0f910eb8..0a4aee71e0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAssociationOverrideContainer.java
@@ -10,8 +10,10 @@
package org.eclipse.jpt.core.context.orm;
import java.util.ListIterator;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.context.AssociationOverrideContainer;
import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
import org.eclipse.jpt.core.utility.TextRange;
public interface OrmAssociationOverrideContainer extends AssociationOverrideContainer, XmlContextNode
@@ -34,5 +36,7 @@ public interface OrmAssociationOverrideContainer extends AssociationOverrideCont
OrmTypeMapping getTypeMapping();
TextRange getValidationTextRange();
+
+ EList<XmlAssociationOverride> getResourceAssociationOverrides();
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverrideContainer.java
index da6e44da7b..0572de154b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeOverrideContainer.java
@@ -10,9 +10,11 @@
package org.eclipse.jpt.core.context.orm;
import java.util.ListIterator;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.context.AttributeOverrideContainer;
import org.eclipse.jpt.core.context.Column;
import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.utility.TextRange;
@@ -43,5 +45,7 @@ public interface OrmAttributeOverrideContainer extends AttributeOverrideContaine
XmlColumn buildVirtualXmlColumn(Column overridableColumn, String attributeName, boolean isMetadataComplete);
TextRange getValidationTextRange();
+
+ EList<XmlAttributeOverride> getResourceAttributeOverrides();
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXmlContextNodeFactory.java
index e3a1feb5f5..cb735574dd 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXmlContextNodeFactory.java
@@ -28,10 +28,8 @@ import org.eclipse.jpt.core.context.java.JavaVersionMapping;
import org.eclipse.jpt.core.jpa2.context.Orderable2_0;
import org.eclipse.jpt.core.resource.orm.AbstractXmlRelationshipMapping;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlBasic;
import org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping;
import org.eclipse.jpt.core.resource.orm.XmlEmbeddable;
@@ -93,9 +91,9 @@ public interface OrmXmlContextNodeFactory
OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, OrmJoinColumn.Owner owner, XmlJoinColumn resourceJoinColumn);
- OrmAttributeOverrideContainer buildOrmAttributeOverrideContainer(XmlContextNode parent, OrmAttributeOverrideContainer.Owner owner, XmlAttributeOverrideContainer resourceAttributeOverrideContainer);
+ OrmAttributeOverrideContainer buildOrmAttributeOverrideContainer(XmlContextNode parent, OrmAttributeOverrideContainer.Owner owner);
- OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(XmlContextNode parent, OrmAssociationOverrideContainer.Owner owner, XmlAssociationOverrideContainer resourceAssociationOverrideContainer);
+ OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(XmlContextNode parent, OrmAssociationOverrideContainer.Owner owner);
OrmAttributeOverride buildOrmAttributeOverride(OrmAttributeOverrideContainer parent, AttributeOverride.Owner owner, XmlAttributeOverride xmlAttributeOverride);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
index a4a7505d1a..13f0bd6d9e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.core.internal.context.orm;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.context.AttributeMapping;
import org.eclipse.jpt.core.context.AttributeOverride;
import org.eclipse.jpt.core.context.BaseColumn;
@@ -29,6 +30,7 @@ import org.eclipse.jpt.core.internal.context.MappingTools;
import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
import org.eclipse.jpt.core.resource.orm.AbstractXmlEmbedded;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.utility.internal.Transformer;
@@ -48,7 +50,10 @@ public abstract class AbstractOrmBaseEmbeddedMapping<T extends AbstractXmlEmbedd
protected AbstractOrmBaseEmbeddedMapping(OrmPersistentAttribute parent, T resourceMapping) {
super(parent, resourceMapping);
this.targetEmbeddable = embeddableFor(this.getJavaPersistentAttribute());
- this.attributeOverrideContainer = getXmlContextNodeFactory().buildOrmAttributeOverrideContainer(this, new AttributeOverrideContainerOwner(), this.resourceAttributeMapping);
+ this.attributeOverrideContainer =
+ getXmlContextNodeFactory().buildOrmAttributeOverrideContainer(
+ this,
+ new AttributeOverrideContainerOwner());
}
@Override
@@ -210,7 +215,11 @@ public abstract class AbstractOrmBaseEmbeddedMapping<T extends AbstractXmlEmbedd
public TypeMapping getOverridableTypeMapping() {
return AbstractOrmBaseEmbeddedMapping.this.getTargetEmbeddable();
}
-
+
+ public EList<XmlAttributeOverride> getResourceAttributeOverrides() {
+ return AbstractOrmBaseEmbeddedMapping.this.resourceAttributeMapping.getAttributeOverrides();
+ }
+
public OrmTypeMapping getTypeMapping() {
return AbstractOrmBaseEmbeddedMapping.this.getTypeMapping();
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
index 2f76d2e25f..53b31765bb 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.MappingKeys;
import org.eclipse.jpt.core.JpaPlatformVariation.Supported;
import org.eclipse.jpt.core.context.AssociationOverride;
@@ -66,6 +67,8 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheableHolder2_0;
import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
import org.eclipse.jpt.core.resource.orm.Inheritance;
import org.eclipse.jpt.core.resource.orm.OrmFactory;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.resource.orm.XmlEntity;
import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
@@ -264,11 +267,15 @@ public abstract class AbstractOrmEntity
}
protected OrmAssociationOverrideContainer buildAssociationOverrideContainer() {
- return getXmlContextNodeFactory().buildOrmAssociationOverrideContainer(this, new AssociationOverrideContainerOwner(), this.resourceTypeMapping);
+ return getXmlContextNodeFactory().buildOrmAssociationOverrideContainer(
+ this,
+ new AssociationOverrideContainerOwner());
}
protected OrmAttributeOverrideContainer buildAttributeOverrideContainer() {
- return getXmlContextNodeFactory().buildOrmAttributeOverrideContainer(this, new AttributeOverrideContainerOwner(), this.resourceTypeMapping);
+ return getXmlContextNodeFactory().buildOrmAttributeOverrideContainer(
+ this,
+ new AttributeOverrideContainerOwner());
}
protected OrmGeneratorContainer buildGeneratorContainer() {
@@ -1729,6 +1736,10 @@ public abstract class AbstractOrmEntity
return AbstractOrmEntity.this.getTypeMapping();
}
+ public EList<XmlAssociationOverride> getResourceAssociationOverrides() {
+ return AbstractOrmEntity.this.resourceTypeMapping.getAssociationOverrides();
+ }
+
public RelationshipReference resolveRelationshipReference(String associationOverrideName) {
if (!isMetadataComplete()) {
JavaPersistentType javaPersistentType = getPersistentType().getJavaPersistentType();
@@ -1890,6 +1901,10 @@ public abstract class AbstractOrmEntity
return AbstractOrmEntity.this.getTypeMapping();
}
+ public EList<XmlAttributeOverride> getResourceAttributeOverrides() {
+ return AbstractOrmEntity.this.resourceTypeMapping.getAttributeOverrides();
+ }
+
public Column resolveOverriddenColumn(String attributeOverrideName) {
if (!isMetadataComplete()) {
JavaPersistentType javaPersistentType = getPersistentType().getJavaPersistentType();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
index 4994ff2f69..e79abc637f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
@@ -142,10 +142,8 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmSingleRelationshipMapping2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
import org.eclipse.jpt.core.resource.orm.AbstractXmlRelationshipMapping;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlBasic;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping;
@@ -237,15 +235,15 @@ public abstract class AbstractOrmXmlContextNodeFactory
return new GenericOrmJoinColumn(parent, owner, resourceJoinColumn);
}
- public OrmAttributeOverrideContainer buildOrmAttributeOverrideContainer(XmlContextNode parent, OrmAttributeOverrideContainer.Owner owner, XmlAttributeOverrideContainer resourceAttributeOverrideContainer) {
- return new GenericOrmAttributeOverrideContainer(parent, owner, resourceAttributeOverrideContainer);
+ public OrmAttributeOverrideContainer buildOrmAttributeOverrideContainer(XmlContextNode parent, OrmAttributeOverrideContainer.Owner owner) {
+ return new GenericOrmAttributeOverrideContainer(parent, owner);
}
- public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(XmlContextNode parent, OrmAssociationOverrideContainer.Owner owner, XmlAssociationOverrideContainer resourceAssociationOverrideContainer) {
- return new GenericOrmAssociationOverrideContainer(parent, owner, resourceAssociationOverrideContainer);
+ public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(XmlContextNode parent, OrmAssociationOverrideContainer.Owner owner) {
+ return new GenericOrmAssociationOverrideContainer(parent, owner);
}
- public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(OrmEmbeddedMapping2_0 parent, OrmAssociationOverrideContainer.Owner owner, XmlAssociationOverrideContainer resourceAssociationOverrideContainer) {
+ public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(OrmEmbeddedMapping2_0 parent, OrmAssociationOverrideContainer.Owner owner) {
return new NullOrmAssociationOverrideContainer(parent, owner);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
index bef651aeb3..6339074582 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.context.AssociationOverride;
import org.eclipse.jpt.core.context.BaseColumn;
import org.eclipse.jpt.core.context.BaseJoinColumn;
@@ -29,7 +30,6 @@ import org.eclipse.jpt.core.internal.context.MappingTools;
import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
import org.eclipse.jpt.core.resource.orm.OrmFactory;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.db.Table;
import org.eclipse.jpt.utility.internal.CollectionTools;
@@ -43,7 +43,6 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter;
public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContextNode
implements OrmAssociationOverrideContainer
{
- protected final XmlAssociationOverrideContainer resourceAssociationOverrideContainer;
protected final List<OrmAssociationOverride> specifiedAssociationOverrides;
@@ -51,10 +50,9 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
protected final OrmAssociationOverrideContainer.Owner owner;
- public GenericOrmAssociationOverrideContainer(XmlContextNode parent, OrmAssociationOverrideContainer.Owner owner, XmlAssociationOverrideContainer resource) {
+ public GenericOrmAssociationOverrideContainer(XmlContextNode parent, OrmAssociationOverrideContainer.Owner owner) {
super(parent);
this.owner = owner;
- this.resourceAssociationOverrideContainer = resource;
this.specifiedAssociationOverrides = new ArrayList<OrmAssociationOverride>();
this.virtualAssociationOverrides = new ArrayList<OrmAssociationOverride>();
this.initializeSpecifiedAssociationOverrides();
@@ -64,6 +62,10 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
protected Owner getOwner() {
return this.owner;
}
+
+ protected EList<XmlAssociationOverride> getResourceAssociationOverrides() {
+ return getOwner().getResourceAssociationOverrides();
+ }
@SuppressWarnings("unchecked")
public ListIterator<OrmAssociationOverride> associationOverrides() {
@@ -115,7 +117,7 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
}
}
- this.resourceAssociationOverrideContainer.getAssociationOverrides().remove(index);
+ this.getResourceAssociationOverrides().remove(index);
fireItemRemoved(SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride);
if (virtualAssociationOverride != null) {
@@ -130,7 +132,7 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
OrmAssociationOverride newAssociationOverride = buildAssociationOverride(xmlAssociationOverride);
this.specifiedAssociationOverrides.add(index, newAssociationOverride);
- this.resourceAssociationOverrideContainer.getAssociationOverrides().add(xmlAssociationOverride);
+ this.getResourceAssociationOverrides().add(xmlAssociationOverride);
int defaultIndex = this.virtualAssociationOverrides.indexOf(oldAssociationOverride);
this.virtualAssociationOverrides.remove(defaultIndex);
@@ -165,7 +167,7 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
public void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex) {
CollectionTools.move(this.specifiedAssociationOverrides, targetIndex, sourceIndex);
- this.resourceAssociationOverrideContainer.getAssociationOverrides().move(targetIndex, sourceIndex);
+ this.getResourceAssociationOverrides().move(targetIndex, sourceIndex);
fireItemMoved(SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex);
}
@@ -239,7 +241,7 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
protected void initializeSpecifiedAssociationOverrides() {
- for (XmlAssociationOverride associationOverride : this.resourceAssociationOverrideContainer.getAssociationOverrides()) {
+ for (XmlAssociationOverride associationOverride : this.getResourceAssociationOverrides()) {
this.specifiedAssociationOverrides.add(buildAssociationOverride(associationOverride));
}
}
@@ -251,7 +253,7 @@ public class GenericOrmAssociationOverrideContainer extends AbstractOrmXmlContex
protected void updateSpecifiedAssociationOverrides() {
// make a copy of the XML overrides (to prevent ConcurrentModificationException)
- Iterator<XmlAssociationOverride> xmlOverrides = new CloneIterator<XmlAssociationOverride>(this.resourceAssociationOverrideContainer.getAssociationOverrides());
+ Iterator<XmlAssociationOverride> xmlOverrides = new CloneIterator<XmlAssociationOverride>(this.getResourceAssociationOverrides());
for (Iterator<OrmAssociationOverride> contextOverrides = this.specifiedAssociationOverrides(); contextOverrides.hasNext(); ) {
OrmAssociationOverride contextOverride = contextOverrides.next();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java
index e5cb378367..f90230b38d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.context.AttributeOverride;
import org.eclipse.jpt.core.context.BaseColumn;
import org.eclipse.jpt.core.context.BaseOverride;
@@ -26,7 +27,6 @@ import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
import org.eclipse.jpt.core.internal.context.orm.VirtualXmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.OrmFactory;
import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.db.Table;
@@ -41,7 +41,6 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter;
public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextNode
implements OrmAttributeOverrideContainer
{
- private final XmlAttributeOverrideContainer resourceAttributeOverrideContainer;
protected final List<OrmAttributeOverride> specifiedAttributeOverrides;
@@ -49,10 +48,9 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
protected final Owner owner;
- public GenericOrmAttributeOverrideContainer(XmlContextNode parent, Owner owner, XmlAttributeOverrideContainer resource) {
+ public GenericOrmAttributeOverrideContainer(XmlContextNode parent, Owner owner) {
super(parent);
this.owner = owner;
- this.resourceAttributeOverrideContainer = resource;
this.specifiedAttributeOverrides = new ArrayList<OrmAttributeOverride>();
this.virtualAttributeOverrides = new ArrayList<OrmAttributeOverride>();
this.initializeSpecifiedAttributeOverrides();
@@ -72,6 +70,10 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
return this.owner;
}
+ protected EList<XmlAttributeOverride> getResourceAttributeOverrides() {
+ return getOwner().getResourceAttributeOverrides();
+ }
+
@SuppressWarnings("unchecked")
public ListIterator<OrmAttributeOverride> attributeOverrides() {
return new CompositeListIterator<OrmAttributeOverride>(specifiedAttributeOverrides(), virtualAttributeOverrides());
@@ -122,7 +124,7 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
}
}
- this.resourceAttributeOverrideContainer.getAttributeOverrides().remove(index);
+ this.getResourceAttributeOverrides().remove(index);
fireItemRemoved(SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
if (virtualAttributeOverride != null) {
@@ -137,7 +139,7 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
OrmAttributeOverride newAttributeOverride = getXmlContextNodeFactory().buildOrmAttributeOverride(this, createAttributeOverrideOwner(), xmlAttributeOverride);
this.specifiedAttributeOverrides.add(index, newAttributeOverride);
- this.resourceAttributeOverrideContainer.getAttributeOverrides().add(xmlAttributeOverride);
+ this.getResourceAttributeOverrides().add(xmlAttributeOverride);
int defaultIndex = this.virtualAttributeOverrides.indexOf(oldAttributeOverride);
this.virtualAttributeOverrides.remove(defaultIndex);
@@ -163,7 +165,7 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
XmlAttributeOverride xmlAttributeOverride = OrmFactory.eINSTANCE.createXmlAttributeOverride();
OrmAttributeOverride attributeOverride = buildAttributeOverride(xmlAttributeOverride);
this.specifiedAttributeOverrides.add(index, attributeOverride);
- this.resourceAttributeOverrideContainer.getAttributeOverrides().add(index, xmlAttributeOverride);
+ this.getResourceAttributeOverrides().add(index, xmlAttributeOverride);
this.fireItemAdded(SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride);
return attributeOverride;
}
@@ -182,7 +184,7 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) {
CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex);
- this.resourceAttributeOverrideContainer.getAttributeOverrides().move(targetIndex, sourceIndex);
+ this.getResourceAttributeOverrides().move(targetIndex, sourceIndex);
fireItemMoved(SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex);
}
@@ -235,13 +237,13 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
}
}
}
-
+
protected void initializeSpecifiedAttributeOverrides() {
- for (XmlAttributeOverride attributeOverride : this.resourceAttributeOverrideContainer.getAttributeOverrides()) {
+ for (XmlAttributeOverride attributeOverride : this.getResourceAttributeOverrides()) {
this.specifiedAttributeOverrides.add(buildAttributeOverride(attributeOverride));
}
}
-
+
public void update() {
this.updateSpecifiedAttributeOverrides();
this.updateVirtualAttributeOverrides();
@@ -263,7 +265,7 @@ public class GenericOrmAttributeOverrideContainer extends AbstractOrmXmlContextN
protected void updateSpecifiedAttributeOverrides() {
// make a copy of the XML overrides (to prevent ConcurrentModificationException)
- Iterator<XmlAttributeOverride> xmlOverrides = new CloneIterator<XmlAttributeOverride>(this.resourceAttributeOverrideContainer.getAttributeOverrides());
+ Iterator<XmlAttributeOverride> xmlOverrides = new CloneIterator<XmlAttributeOverride>(this.getResourceAttributeOverrides());
for (Iterator<OrmAttributeOverride> contextOverrides = this.specifiedAttributeOverrides(); contextOverrides.hasNext(); ) {
OrmAttributeOverride contextOverride = contextOverrides.next();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java
index 9bfa5a8102..4d0c77014f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.core.internal.jpa1.context.orm;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.MappingKeys;
import org.eclipse.jpt.core.context.AssociationOverride;
import org.eclipse.jpt.core.context.AttributeMapping;
@@ -34,6 +35,7 @@ import org.eclipse.jpt.core.jpa2.context.java.JavaEmbeddedMapping2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmEmbeddedMapping2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
import org.eclipse.jpt.core.resource.orm.Attributes;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
import org.eclipse.jpt.core.resource.orm.XmlEmbedded;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.utility.internal.CollectionTools;
@@ -57,7 +59,9 @@ public class GenericOrmEmbeddedMapping
super(parent, resourceMapping);
this.associationOverrideContainer =
((OrmXml2_0ContextNodeFactory) getXmlContextNodeFactory()).
- buildOrmAssociationOverrideContainer(this, new AssociationOverrideContainerOwner(), this.resourceAttributeMapping);
+ buildOrmAssociationOverrideContainer(
+ this,
+ new AssociationOverrideContainerOwner());
}
@Override
@@ -224,6 +228,10 @@ public class GenericOrmEmbeddedMapping
return GenericOrmEmbeddedMapping.this.getTypeMapping();
}
+ public EList<XmlAssociationOverride> getResourceAssociationOverrides() {
+ return GenericOrmEmbeddedMapping.this.resourceAttributeMapping.getAssociationOverrides();
+ }
+
public RelationshipReference resolveRelationshipReference(String associationOverrideName) {
if (getPersistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) {
JavaAssociationOverride javaAssociationOverride = getJavaAssociationOverrideNamed(associationOverrideName);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java
index 9f8c2132c4..3a661f8680 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.core.internal.jpa2.context.orm;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.MappingKeys;
import org.eclipse.jpt.core.context.AssociationOverride;
import org.eclipse.jpt.core.context.AttributeMapping;
@@ -55,6 +56,8 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
import org.eclipse.jpt.core.resource.orm.Attributes;
import org.eclipse.jpt.core.resource.orm.MapKey;
import org.eclipse.jpt.core.resource.orm.OrmFactory;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.resource.orm.XmlElementCollection;
@@ -506,7 +509,7 @@ public class GenericOrmElementCollectionMapping2_0
}
protected OrmAttributeOverrideContainer buildValueAttributeOverrideContainer() {
- return getXmlContextNodeFactory().buildOrmAttributeOverrideContainer(this, new AttributeOverrideContainerOwner(), this.getResourceAttributeMapping());
+ return getXmlContextNodeFactory().buildOrmAttributeOverrideContainer(this, new AttributeOverrideContainerOwner());
}
protected JavaAttributeOverride getJavaValueAttributeOverrideNamed(String attributeName) {
@@ -521,7 +524,7 @@ public class GenericOrmElementCollectionMapping2_0
}
protected OrmAssociationOverrideContainer buildValueAssociationOverrideContainer() {
- return getXmlContextNodeFactory().buildOrmAssociationOverrideContainer(this, new AssociationOverrideContainerOwner(), this.getResourceAttributeMapping());
+ return getXmlContextNodeFactory().buildOrmAssociationOverrideContainer(this, new AssociationOverrideContainerOwner());
}
protected JavaAssociationOverride getJavaValueAssociationOverrideNamed(String attributeName) {
@@ -1350,6 +1353,10 @@ public class GenericOrmElementCollectionMapping2_0
return GenericOrmElementCollectionMapping2_0.this.getTypeMapping();
}
+ public EList<XmlAssociationOverride> getResourceAssociationOverrides() {
+ return GenericOrmElementCollectionMapping2_0.this.resourceAttributeMapping.getAssociationOverrides();
+ }
+
public RelationshipReference resolveRelationshipReference(String associationOverrideName) {
if (getPersistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) {
JavaAssociationOverride javaAssociationOverride = getJavaValueAssociationOverrideNamed(associationOverrideName);
@@ -1605,6 +1612,10 @@ public class GenericOrmElementCollectionMapping2_0
return GenericOrmElementCollectionMapping2_0.this.getTypeMapping();
}
+ public EList<XmlAttributeOverride> getResourceAttributeOverrides() {
+ return GenericOrmElementCollectionMapping2_0.this.resourceAttributeMapping.getAttributeOverrides();
+ }
+
public Column resolveOverriddenColumn(String attributeOverrideName) {
if (getPersistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) {
JavaAttributeOverride javaAttributeOverride = getJavaValueAttributeOverrideNamed(attributeOverrideName);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java
index c1dbe0ee7e..b8abde8624 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java
@@ -53,7 +53,6 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovable2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmSingleRelationshipMapping2_0;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlBasic;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlElementCollection;
@@ -98,10 +97,9 @@ public class GenericOrmXml2_0ContextNodeFactory extends AbstractOrmXmlContextNod
@Override
public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(
OrmEmbeddedMapping2_0 parent,
- Owner owner,
- XmlAssociationOverrideContainer resourceAssociationOverrideContainer) {
+ Owner owner) {
- return new GenericOrmAssociationOverrideContainer(parent, owner, resourceAssociationOverrideContainer);
+ return new GenericOrmAssociationOverrideContainer(parent, owner);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java
index e46bb951d5..567bc3dd9b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java
@@ -15,7 +15,6 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
import org.eclipse.jpt.core.context.orm.OrmXmlContextNodeFactory;
import org.eclipse.jpt.core.jpa2.context.java.JavaElementCollectionMapping2_0;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlElementCollection;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
@@ -39,8 +38,7 @@ public interface OrmXml2_0ContextNodeFactory extends OrmXmlContextNodeFactory
//overloaded because the 2.0 JPA spec supports association overrides on an embedded mapping while the 1.0 spec did not
OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(
OrmEmbeddedMapping2_0 parent,
- OrmAssociationOverrideContainer.Owner owner,
- XmlAssociationOverrideContainer resourceAssociationOverrideContainer);
+ OrmAssociationOverrideContainer.Owner owner);
OrmDerivedIdentity2_0 buildOrmDerivedIdentity(
OrmSingleRelationshipMapping2_0 parent, XmlSingleRelationshipMapping_2_0 resource);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java
index 2fafb4218a..8c7b1771e7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrderable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
@@ -104,6 +105,15 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
*/
protected String orderBy = ORDER_BY_EDEFAULT;
/**
+ * The cached value of the '{@link #getMapKeyAttributeOverrides() <em>Map Key Attribute Overrides</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyAttributeOverrides()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlAttributeOverride> mapKeyAttributeOverrides;
+ /**
* The cached value of the '{@link #getMapKeyClass() <em>Map Key Class</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -141,15 +151,6 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
*/
protected EnumType mapKeyEnumerated = MAP_KEY_ENUMERATED_EDEFAULT;
/**
- * The cached value of the '{@link #getMapKeyAttributeOverrides() <em>Map Key Attribute Overrides</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMapKeyAttributeOverrides()
- * @generated
- * @ordered
- */
- protected EList<XmlAttributeOverride> mapKeyAttributeOverrides;
- /**
* The cached value of the '{@link #getMapKeyColumn() <em>Map Key Column</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -387,6 +388,29 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
}
/**
+ * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAttributeOverride> getMapKeyAttributeOverrides()
+ {
+ if (mapKeyAttributeOverrides == null)
+ {
+ mapKeyAttributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES);
+ }
+ return mapKeyAttributeOverrides;
+ }
+
+ /**
* Returns the value of the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -523,29 +547,6 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
}
/**
- * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides()
- * @model containment="true"
- * @generated
- */
- public EList<XmlAttributeOverride> getMapKeyAttributeOverrides()
- {
- if (mapKeyAttributeOverrides == null)
- {
- mapKeyAttributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES);
- }
- return mapKeyAttributeOverrides;
- }
-
- /**
* Returns the value of the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -700,10 +701,10 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
return basicSetJoinTable(null, msgs);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN:
return basicSetOrderColumn(null, msgs);
- case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS:
- return basicSetMapKeyClass(null, msgs);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
return ((InternalEList<?>)getMapKeyAttributeOverrides()).basicRemove(otherEnd, msgs);
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS:
+ return basicSetMapKeyClass(null, msgs);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN:
return basicSetMapKeyColumn(null, msgs);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_JOIN_COLUMNS:
@@ -732,14 +733,14 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
return getOrderColumn();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
return getOrderBy();
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ return getMapKeyAttributeOverrides();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS:
return getMapKeyClass();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL:
return getMapKeyTemporal();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED:
return getMapKeyEnumerated();
- case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
- return getMapKeyAttributeOverrides();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN:
return getMapKeyColumn();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_JOIN_COLUMNS:
@@ -773,6 +774,10 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
setOrderBy((String)newValue);
return;
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ getMapKeyAttributeOverrides().clear();
+ getMapKeyAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
+ return;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS:
setMapKeyClass((XmlMapKeyClass)newValue);
return;
@@ -782,10 +787,6 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED:
setMapKeyEnumerated((EnumType)newValue);
return;
- case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
- getMapKeyAttributeOverrides().clear();
- getMapKeyAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
- return;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN:
setMapKeyColumn((XmlColumn)newValue);
return;
@@ -822,6 +823,9 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
setOrderBy(ORDER_BY_EDEFAULT);
return;
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ getMapKeyAttributeOverrides().clear();
+ return;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS:
setMapKeyClass((XmlMapKeyClass)null);
return;
@@ -831,9 +835,6 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED:
setMapKeyEnumerated(MAP_KEY_ENUMERATED_EDEFAULT);
return;
- case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
- getMapKeyAttributeOverrides().clear();
- return;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN:
setMapKeyColumn((XmlColumn)null);
return;
@@ -865,14 +866,14 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
return orderColumn != null;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
return ORDER_BY_EDEFAULT == null ? orderBy != null : !ORDER_BY_EDEFAULT.equals(orderBy);
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ return mapKeyAttributeOverrides != null && !mapKeyAttributeOverrides.isEmpty();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS:
return mapKeyClass != null;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL:
return mapKeyTemporal != MAP_KEY_TEMPORAL_EDEFAULT;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED:
return mapKeyEnumerated != MAP_KEY_ENUMERATED_EDEFAULT;
- case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES:
- return mapKeyAttributeOverrides != null && !mapKeyAttributeOverrides.isEmpty();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN:
return mapKeyColumn != null;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_JOIN_COLUMNS:
@@ -923,6 +924,14 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlMultiRelationshipMapping_2_0.class)
{
switch (derivedFeatureID)
@@ -930,7 +939,6 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS: return OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL: return OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED: return OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED;
- case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN: return OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_COLUMN;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_JOIN_COLUMNS: return OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_JOIN_COLUMNS;
default: return -1;
@@ -979,6 +987,14 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlMultiRelationshipMapping_2_0.class)
{
switch (baseFeatureID)
@@ -986,7 +1002,6 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS;
case OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL;
case OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED;
- case OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES;
case OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_COLUMN: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_COLUMN;
case OrmV2_0Package.XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_JOIN_COLUMNS: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_JOIN_COLUMNS;
default: return -1;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
index 54c22a407b..24ca6ddbe4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
@@ -496,40 +496,40 @@ public class OrmPackage extends EPackageImpl
public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 7;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -739,7 +739,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTypeMapping()
* @generated
*/
- public static final int XML_TYPE_MAPPING = 81;
+ public static final int XML_TYPE_MAPPING = 82;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}' class.
@@ -1812,67 +1812,67 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
/**
- * The feature id for the '<em><b>Target Class</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
/**
- * The feature id for the '<em><b>Fetch</b></em>' attribute.
+ * The feature id for the '<em><b>Target Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
+ public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
/**
- * The feature id for the '<em><b>Map Key</b></em>' containment reference.
+ * The feature id for the '<em><b>Fetch</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 9;
+ public static final int XML_ELEMENT_COLLECTION__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 9;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 10;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 10;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -2800,7 +2800,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery()
* @generated
*/
- public static final int XML_QUERY = 72;
+ public static final int XML_QUERY = 73;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
@@ -2860,7 +2860,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderColumn()
* @generated
*/
- public static final int XML_ORDER_COLUMN = 60;
+ public static final int XML_ORDER_COLUMN = 61;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
@@ -2870,7 +2870,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 61;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 62;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
@@ -2880,7 +2880,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_METADATA = 62;
+ public static final int XML_PERSISTENCE_UNIT_METADATA = 63;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}' class.
@@ -2890,7 +2890,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad()
* @generated
*/
- public static final int POST_LOAD = 64;
+ public static final int POST_LOAD = 65;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
@@ -2900,7 +2900,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist()
* @generated
*/
- public static final int POST_PERSIST = 65;
+ public static final int POST_PERSIST = 66;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
@@ -2910,7 +2910,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove()
* @generated
*/
- public static final int POST_REMOVE = 66;
+ public static final int POST_REMOVE = 67;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
@@ -2920,7 +2920,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate()
* @generated
*/
- public static final int POST_UPDATE = 67;
+ public static final int POST_UPDATE = 68;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
@@ -2930,7 +2930,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist()
* @generated
*/
- public static final int PRE_PERSIST = 68;
+ public static final int PRE_PERSIST = 69;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
@@ -2940,7 +2940,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove()
* @generated
*/
- public static final int PRE_REMOVE = 69;
+ public static final int PRE_REMOVE = 70;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
@@ -2950,7 +2950,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate()
* @generated
*/
- public static final int PRE_UPDATE = 70;
+ public static final int PRE_UPDATE = 71;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}' class.
@@ -2960,7 +2960,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn()
* @generated
*/
- public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 71;
+ public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 72;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}' class.
@@ -2970,7 +2970,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryContainer()
* @generated
*/
- public static final int XML_QUERY_CONTAINER = 73;
+ public static final int XML_QUERY_CONTAINER = 74;
/**
* The feature id for the '<em><b>Version</b></em>' attribute.
@@ -3557,7 +3557,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlReferenceTable()
* @generated
*/
- public static final int XML_REFERENCE_TABLE = 63;
+ public static final int XML_REFERENCE_TABLE = 64;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -3731,40 +3731,40 @@ public class OrmPackage extends EPackageImpl
public static final int XML_MANY_TO_MANY__ORDER_BY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -4316,40 +4316,40 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ONE_TO_MANY__ORDER_BY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_ENUMERATED;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -4532,6 +4532,133 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ONE_TO_ONE_FEATURE_COUNT = ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryHint()
+ * @generated
+ */
+ public static final int XML_QUERY_HINT = 75;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable()
+ * @generated
+ */
+ public static final int XML_SECONDARY_TABLE = 76;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
+ * @generated
+ */
+ public static final int XML_SEQUENCE_GENERATOR = 77;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping()
+ * @generated
+ */
+ public static final int SQL_RESULT_SET_MAPPING = 78;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlTable
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTable()
+ * @generated
+ */
+ public static final int XML_TABLE = 79;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator()
+ * @generated
+ */
+ public static final int XML_TABLE_GENERATOR = 80;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlTransient
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransient()
+ * @generated
+ */
+ public static final int XML_TRANSIENT = 81;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
+ * @generated
+ */
+ public static final int XML_UNIQUE_CONSTRAINT = 83;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlVersion
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion()
+ * @generated
+ */
+ public static final int XML_VERSION = 84;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlOrderable
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable()
+ * @generated
+ */
+ public static final int XML_ORDERABLE = 60;
+
+ /**
+ * The feature id for the '<em><b>Order Column</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ORDERABLE__ORDER_COLUMN = OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN;
+
+ /**
+ * The feature id for the '<em><b>Order By</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ORDERABLE__ORDER_BY = OrmV2_0Package.XML_ORDERABLE_20_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Orderable</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ORDERABLE_FEATURE_COUNT = OrmV2_0Package.XML_ORDERABLE_20_FEATURE_COUNT + 1;
+
+ /**
* The feature id for the '<em><b>Column Definition</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4964,16 +5091,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_QUERY_CONTAINER_FEATURE_COUNT = 2;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryHint()
- * @generated
- */
- public static final int XML_QUERY_HINT = 74;
-
- /**
* The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5010,16 +5127,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_QUERY_HINT_FEATURE_COUNT = OrmV2_0Package.XML_QUERY_HINT_20_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable()
- * @generated
- */
- public static final int XML_SECONDARY_TABLE = 75;
-
- /**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5074,16 +5181,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_SECONDARY_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator()
- * @generated
- */
- public static final int XML_SEQUENCE_GENERATOR = 76;
-
- /**
* The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5156,16 +5253,6 @@ 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.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping()
- * @generated
- */
- public static final int SQL_RESULT_SET_MAPPING = 77;
-
- /**
* The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5211,16 +5298,6 @@ public class OrmPackage extends EPackageImpl
public static final int SQL_RESULT_SET_MAPPING_FEATURE_COUNT = OrmV2_0Package.XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlTable
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTable()
- * @generated
- */
- public static final int XML_TABLE = 78;
-
- /**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5266,16 +5343,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator()
- * @generated
- */
- public static final int XML_TABLE_GENERATOR = 79;
-
- /**
* The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5384,16 +5451,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = XML_GENERATOR_FEATURE_COUNT + 7;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlTransient
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransient()
- * @generated
- */
- public static final int XML_TRANSIENT = 80;
-
- /**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5421,16 +5478,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_TRANSIENT_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint()
- * @generated
- */
- public static final int XML_UNIQUE_CONSTRAINT = 82;
-
- /**
* The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5458,16 +5505,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_UNIQUE_CONSTRAINT_FEATURE_COUNT = OrmV2_0Package.XML_UNIQUE_CONSTRAINT_20_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlVersion
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion()
- * @generated
- */
- public static final int XML_VERSION = 83;
-
- /**
* The feature id for the '<em><b>Access</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5531,43 +5568,6 @@ public class OrmPackage extends EPackageImpl
public static final int XML_VERSION_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.XmlOrderable
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable()
- * @generated
- */
- public static final int XML_ORDERABLE = 84;
-
- /**
- * The feature id for the '<em><b>Order Column</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_ORDERABLE__ORDER_COLUMN = OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN;
-
- /**
- * The feature id for the '<em><b>Order By</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_ORDERABLE__ORDER_BY = OrmV2_0Package.XML_ORDERABLE_20_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Xml Orderable</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_ORDERABLE_FEATURE_COUNT = OrmV2_0Package.XML_ORDERABLE_20_FEATURE_COUNT + 1;
-
- /**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9830,6 +9830,9 @@ public class OrmPackage extends EPackageImpl
xmlOneToOneEClass = createEClass(XML_ONE_TO_ONE);
createEReference(xmlOneToOneEClass, XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS);
+ xmlOrderableEClass = createEClass(XML_ORDERABLE);
+ createEAttribute(xmlOrderableEClass, XML_ORDERABLE__ORDER_BY);
+
xmlOrderColumnEClass = createEClass(XML_ORDER_COLUMN);
xmlPersistenceUnitDefaultsEClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS);
@@ -9910,9 +9913,6 @@ public class OrmPackage extends EPackageImpl
xmlVersionEClass = createEClass(XML_VERSION);
- xmlOrderableEClass = createEClass(XML_ORDERABLE);
- createEAttribute(xmlOrderableEClass, XML_ORDERABLE__ORDER_BY);
-
// Create enums
accessTypeEEnum = createEEnum(ACCESS_TYPE);
discriminatorTypeEEnum = createEEnum(DISCRIMINATOR_TYPE);
@@ -10032,6 +10032,7 @@ public class OrmPackage extends EPackageImpl
xmlOneToOneEClass.getESuperTypes().add(this.getAbstractXmlSingleRelationshipMapping());
xmlOneToOneEClass.getESuperTypes().add(this.getXmlMappedByMapping());
xmlOneToOneEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOneToOne_2_0());
+ xmlOrderableEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOrderable_2_0());
xmlOrderColumnEClass.getESuperTypes().add(this.getAbstractXmlNamedColumn());
xmlOrderColumnEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOrderColumn_2_0());
xmlPersistenceUnitDefaultsEClass.getESuperTypes().add(this.getXmlAccessHolder());
@@ -10059,7 +10060,6 @@ public class OrmPackage extends EPackageImpl
xmlVersionEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlVersionEClass.getESuperTypes().add(this.getColumnMapping());
xmlVersionEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
- xmlOrderableEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOrderable_2_0());
// Initialize classes and features; add operations and parameters
initEClass(abstractXmlAttributeMappingEClass, AbstractXmlAttributeMapping.class, "AbstractXmlAttributeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -10292,6 +10292,9 @@ public class OrmPackage extends EPackageImpl
initEClass(xmlOneToOneEClass, XmlOneToOne.class, "XmlOneToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlOneToOne_PrimaryKeyJoinColumns(), this.getXmlPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, XmlOneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlOrderableEClass, XmlOrderable.class, "XmlOrderable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlOrderable_OrderBy(), theXMLTypePackage.getString(), "orderBy", null, 0, 1, XmlOrderable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(xmlOrderColumnEClass, XmlOrderColumn.class, "XmlOrderColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlPersistenceUnitDefaultsEClass, XmlPersistenceUnitDefaults.class, "XmlPersistenceUnitDefaults", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -10372,9 +10375,6 @@ public class OrmPackage extends EPackageImpl
initEClass(xmlVersionEClass, XmlVersion.class, "XmlVersion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEClass(xmlOrderableEClass, XmlOrderable.class, "XmlOrderable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getXmlOrderable_OrderBy(), theXMLTypePackage.getString(), "orderBy", null, 0, 1, XmlOrderable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
// Initialize enums and add enum literals
initEEnum(accessTypeEEnum, AccessType.class, "AccessType");
addEEnumLiteral(accessTypeEEnum, AccessType.PROPERTY);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
index 0d485edacd..8a5e6b22c1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
@@ -28,6 +28,7 @@ import org.eclipse.jpt.core.jpa2.MappingKeys2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrderable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -147,6 +148,16 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
protected EList<XmlAssociationOverride> associationOverrides;
/**
+ * The cached value of the '{@link #getMapKeyAttributeOverrides() <em>Map Key Attribute Overrides</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMapKeyAttributeOverrides()
+ * @generated
+ * @ordered
+ */
+ protected EList<XmlAttributeOverride> mapKeyAttributeOverrides;
+
+ /**
* The default value of the '{@link #getTargetClass() <em>Target Class</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -235,16 +246,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
protected EnumType mapKeyEnumerated = MAP_KEY_ENUMERATED_EDEFAULT;
/**
- * The cached value of the '{@link #getMapKeyAttributeOverrides() <em>Map Key Attribute Overrides</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMapKeyAttributeOverrides()
- * @generated
- * @ordered
- */
- protected EList<XmlAttributeOverride> mapKeyAttributeOverrides;
-
- /**
* The cached value of the '{@link #getMapKeyColumn() <em>Map Key Column</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -571,6 +572,29 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
}
/**
+ * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAttributeOverride> getMapKeyAttributeOverrides()
+ {
+ if (mapKeyAttributeOverrides == null)
+ {
+ mapKeyAttributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES);
+ }
+ return mapKeyAttributeOverrides;
+ }
+
+ /**
* Returns the value of the '<em><b>Order Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -827,29 +851,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
}
/**
- * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlElementCollection_2_0_MapKeyAttributeOverrides()
- * @model containment="true"
- * @generated
- */
- public EList<XmlAttributeOverride> getMapKeyAttributeOverrides()
- {
- if (mapKeyAttributeOverrides == null)
- {
- mapKeyAttributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES);
- }
- return mapKeyAttributeOverrides;
- }
-
- /**
* Returns the value of the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -1068,12 +1069,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return ((InternalEList<?>)getAttributeOverrides()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES:
return ((InternalEList<?>)getAssociationOverrides()).basicRemove(otherEnd, msgs);
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ return ((InternalEList<?>)getMapKeyAttributeOverrides()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY:
return basicSetMapKey(null, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS:
return basicSetMapKeyClass(null, msgs);
- case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
- return ((InternalEList<?>)getMapKeyAttributeOverrides()).basicRemove(otherEnd, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN:
return basicSetMapKeyColumn(null, msgs);
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS:
@@ -1110,6 +1111,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return getAttributeOverrides();
case OrmPackage.XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES:
return getAssociationOverrides();
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ return getMapKeyAttributeOverrides();
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
return getTargetClass();
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH:
@@ -1122,8 +1125,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return getMapKeyTemporal();
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED:
return getMapKeyEnumerated();
- case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
- return getMapKeyAttributeOverrides();
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN:
return getMapKeyColumn();
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS:
@@ -1170,6 +1171,10 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
getAssociationOverrides().clear();
getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ getMapKeyAttributeOverrides().clear();
+ getMapKeyAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
+ return;
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
setTargetClass((String)newValue);
return;
@@ -1188,10 +1193,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED:
setMapKeyEnumerated((EnumType)newValue);
return;
- case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
- getMapKeyAttributeOverrides().clear();
- getMapKeyAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
- return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN:
setMapKeyColumn((XmlColumn)newValue);
return;
@@ -1240,6 +1241,9 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES:
getAssociationOverrides().clear();
return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ getMapKeyAttributeOverrides().clear();
+ return;
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
setTargetClass(TARGET_CLASS_EDEFAULT);
return;
@@ -1258,9 +1262,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED:
setMapKeyEnumerated(MAP_KEY_ENUMERATED_EDEFAULT);
return;
- case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
- getMapKeyAttributeOverrides().clear();
- return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN:
setMapKeyColumn((XmlColumn)null);
return;
@@ -1301,6 +1302,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return attributeOverrides != null && !attributeOverrides.isEmpty();
case OrmPackage.XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES:
return associationOverrides != null && !associationOverrides.isEmpty();
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
+ return mapKeyAttributeOverrides != null && !mapKeyAttributeOverrides.isEmpty();
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
return TARGET_CLASS_EDEFAULT == null ? targetClass != null : !TARGET_CLASS_EDEFAULT.equals(targetClass);
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH:
@@ -1313,8 +1316,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return mapKeyTemporal != MAP_KEY_TEMPORAL_EDEFAULT;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED:
return mapKeyEnumerated != MAP_KEY_ENUMERATED_EDEFAULT;
- case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES:
- return mapKeyAttributeOverrides != null && !mapKeyAttributeOverrides.isEmpty();
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN:
return mapKeyColumn != null;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS:
@@ -1377,6 +1378,14 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlElementCollection_2_0.class)
{
switch (derivedFeatureID)
@@ -1387,7 +1396,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_ENUMERATED;
- case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_ATTRIBUTE_OVERRIDES;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_COLUMN;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_JOIN_COLUMNS;
case OrmPackage.XML_ELEMENT_COLLECTION__COLUMN: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__COLUMN;
@@ -1448,6 +1456,14 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAttributeOverrideContainer2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_0Package.XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlElementCollection_2_0.class)
{
switch (baseFeatureID)
@@ -1458,7 +1474,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_ENUMERATED: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED;
- case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_COLUMN: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_JOIN_COLUMNS: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__COLUMN: return OrmPackage.XML_ELEMENT_COLLECTION__COLUMN;
@@ -1544,7 +1559,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
buildMapKeyClassTranslator(),
buildMapKeyTemporalTranslator(),
buildMapKeyEnumeratedTranslator(),
- XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyAttributeOverrides()),
+ buildMapKeyAttributeOverrideTranslator(),
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()),
XmlColumn.buildTranslator(JPA.COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_Column()),
@@ -1612,4 +1627,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
protected static Translator buildAssociationOverrideTranslator() {
return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides());
}
+
+ protected static Translator buildMapKeyAttributeOverrideTranslator() {
+ return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides());
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
index 129a1bc214..400789bf42 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
@@ -103,9 +103,9 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
protected static Translator buildMapKeyEnumeratedTranslator() {
return new Translator(JPA2_0.MAP_KEY_ENUMERATED, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyEnumerated());
}
-
+
protected static Translator buildMapKeyAttributeOverrideTranslator() {
- return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides());
+ return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides());
}
protected static Translator buildMapKeyColumnTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
index bed54d18b5..1db9324e43 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
@@ -391,9 +391,9 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
}
protected static Translator buildMapKeyAttributeOverrideTranslator() {
- return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides());
+ return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides());
}
-
+
protected static Translator buildMapKeyColumnTranslator() {
return XmlColumn.buildTranslator(JPA2_0.MAP_KEY_COLUMN, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyColumn());
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
index 4ce26d0b77..871e4e779d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
@@ -81,25 +81,17 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlAttributeMapping_2_0()
* @generated
*/
- public static final int XML_ATTRIBUTE_MAPPING_20 = 0;
+ public static final int XML_ATTRIBUTE_MAPPING_20 = 1;
/**
- * The feature id for the '<em><b>Access</b></em>' attribute.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 <em>Xml Map Key Attribute Override Container2 0</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0()
* @generated
- * @ordered
*/
- public static final int XML_ATTRIBUTE_MAPPING_20__ACCESS = OrmPackage.XML_ACCESS_HOLDER__ACCESS;
-
- /**
- * The number of structural features of the '<em>Xml Attribute Mapping 20</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_ATTRIBUTE_MAPPING_20_FEATURE_COUNT = OrmPackage.XML_ACCESS_HOLDER_FEATURE_COUNT + 0;
+ public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0 = 14;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAssociationOverride_2_0 <em>Xml Association Override 20</em>}' class.
@@ -109,7 +101,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlAssociationOverride_2_0()
* @generated
*/
- public static final int XML_ASSOCIATION_OVERRIDE_20 = 1;
+ public static final int XML_ASSOCIATION_OVERRIDE_20 = 0;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -139,6 +131,24 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_ASSOCIATION_OVERRIDE_20_FEATURE_COUNT = 2;
/**
+ * The feature id for the '<em><b>Access</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ATTRIBUTE_MAPPING_20__ACCESS = OrmPackage.XML_ACCESS_HOLDER__ACCESS;
+
+ /**
+ * The number of structural features of the '<em>Xml Attribute Mapping 20</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ATTRIBUTE_MAPPING_20_FEATURE_COUNT = OrmPackage.XML_ACCESS_HOLDER_FEATURE_COUNT + 0;
+
+ /**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAttributeOverride_2_0 <em>Xml Attribute Override 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -211,63 +221,101 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCollectionTable_2_0()
* @generated
*/
- public static final int XML_COLLECTION_TABLE_20 = 4;
+ public static final int XML_COLLECTION_TABLE_20 = 5;
/**
- * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0 <em>Xml Derived Id 20</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlDerivedId_2_0()
+ * @generated
+ */
+ public static final int XML_DERIVED_ID_20 = 6;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlElementCollection_2_0()
+ * @generated
+ */
+ public static final int XML_ELEMENT_COLLECTION_20 = 7;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlEmbedded_2_0 <em>Xml Embedded 20</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlEmbedded_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlEmbedded_2_0()
+ * @generated
+ */
+ public static final int XML_EMBEDDED_20 = 8;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0 <em>Xml Cacheable 20</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0()
+ * @generated
+ */
+ public static final int XML_CACHEABLE_20 = 4;
+
+ /**
+ * The feature id for the '<em><b>Cacheable</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_COLLECTION_TABLE_20__JOIN_COLUMNS = OrmPackage.XML_REFERENCE_TABLE__JOIN_COLUMNS;
+ public static final int XML_CACHEABLE_20__CACHEABLE = 0;
/**
- * The number of structural features of the '<em>Xml Collection Table 20</em>' class.
+ * The number of structural features of the '<em>Xml Cacheable 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_COLLECTION_TABLE_20_FEATURE_COUNT = OrmPackage.XML_REFERENCE_TABLE_FEATURE_COUNT + 0;
+ public static final int XML_CACHEABLE_20_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0 <em>Xml Derived Id 20</em>}' class.
+ * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlDerivedId_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_DERIVED_ID_20 = 5;
+ public static final int XML_COLLECTION_TABLE_20__JOIN_COLUMNS = OrmPackage.XML_REFERENCE_TABLE__JOIN_COLUMNS;
/**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ * The number of structural features of the '<em>Xml Collection Table 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_DERIVED_ID_20__ID = 0;
+ public static final int XML_COLLECTION_TABLE_20_FEATURE_COUNT = OrmPackage.XML_REFERENCE_TABLE_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>Xml Derived Id 20</em>' class.
+ * The feature id for the '<em><b>Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_DERIVED_ID_20_FEATURE_COUNT = 1;
+ public static final int XML_DERIVED_ID_20__ID = 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class.
+ * The number of structural features of the '<em>Xml Derived Id 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlElementCollection_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20 = 6;
+ public static final int XML_DERIVED_ID_20_FEATURE_COUNT = 1;
/**
* The feature id for the '<em><b>Lob</b></em>' attribute.
@@ -333,67 +381,67 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION_20__ASSOCIATION_OVERRIDES = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Target Class</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__TARGET_CLASS = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Fetch</b></em>' attribute.
+ * The feature id for the '<em><b>Target Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__FETCH = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_ELEMENT_COLLECTION_20__TARGET_CLASS = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Map Key</b></em>' containment reference.
+ * The feature id for the '<em><b>Fetch</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_ELEMENT_COLLECTION_20__FETCH = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 6;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 7;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 8;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 8;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ENUMERATED = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 9;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 9;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 10;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ENUMERATED = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -441,16 +489,6 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION_20_FEATURE_COUNT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 15;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlEmbedded_2_0 <em>Xml Embedded 20</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlEmbedded_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlEmbedded_2_0()
- * @generated
- */
- public static final int XML_EMBEDDED_20 = 7;
-
- /**
* The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -469,34 +507,6 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_EMBEDDED_20_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0 <em>Xml Cacheable 20</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0()
- * @generated
- */
- public static final int XML_CACHEABLE_20 = 28;
-
- /**
- * The feature id for the '<em><b>Cacheable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_CACHEABLE_20__CACHEABLE = 0;
-
- /**
- * The number of structural features of the '<em>Xml Cacheable 20</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_CACHEABLE_20_FEATURE_COUNT = 1;
-
- /**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -504,7 +514,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlEntity_2_0()
* @generated
*/
- public static final int XML_ENTITY_20 = 8;
+ public static final int XML_ENTITY_20 = 9;
/**
* The feature id for the '<em><b>Cacheable</b></em>' attribute.
@@ -532,7 +542,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlEntityListener_2_0()
* @generated
*/
- public static final int XML_ENTITY_LISTENER_20 = 9;
+ public static final int XML_ENTITY_LISTENER_20 = 10;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -560,7 +570,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlEventMethod_2_0()
* @generated
*/
- public static final int XML_EVENT_METHOD_20 = 10;
+ public static final int XML_EVENT_METHOD_20 = 11;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -588,7 +598,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlGenerator_2_0()
* @generated
*/
- public static final int XML_GENERATOR_20 = 11;
+ public static final int XML_GENERATOR_20 = 12;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -616,7 +626,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrderable_2_0()
* @generated
*/
- public static final int XML_ORDERABLE_20 = 30;
+ public static final int XML_ORDERABLE_20 = 21;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -644,7 +654,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMultiRelationshipMapping_2_0()
* @generated
*/
- public static final int XML_MULTI_RELATIONSHIP_MAPPING_20 = 15;
+ public static final int XML_MULTI_RELATIONSHIP_MAPPING_20 = 17;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -656,40 +666,40 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__ORDER_COLUMN = XML_ORDERABLE_20__ORDER_COLUMN;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS = XML_ORDERABLE_20_FEATURE_COUNT + 0;
+ public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_ORDERABLE_20_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL = XML_ORDERABLE_20_FEATURE_COUNT + 1;
+ public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS = XML_ORDERABLE_20_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED = XML_ORDERABLE_20_FEATURE_COUNT + 2;
+ public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL = XML_ORDERABLE_20_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_ORDERABLE_20_FEATURE_COUNT + 3;
+ public static final int XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED = XML_ORDERABLE_20_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -726,7 +736,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlManyToMany_2_0()
* @generated
*/
- public static final int XML_MANY_TO_MANY_20 = 12;
+ public static final int XML_MANY_TO_MANY_20 = 13;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -738,40 +748,40 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_MANY_TO_MANY_20__ORDER_COLUMN = XML_MULTI_RELATIONSHIP_MAPPING_20__ORDER_COLUMN;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_20__MAP_KEY_CLASS = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS;
+ public static final int XML_MANY_TO_MANY_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_20__MAP_KEY_TEMPORAL = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL;
+ public static final int XML_MANY_TO_MANY_20__MAP_KEY_CLASS = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_20__MAP_KEY_ENUMERATED = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED;
+ public static final int XML_MANY_TO_MANY_20__MAP_KEY_TEMPORAL = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ public static final int XML_MANY_TO_MANY_20__MAP_KEY_ENUMERATED = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -801,6 +811,24 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_MANY_TO_MANY_20_FEATURE_COUNT = XML_MULTI_RELATIONSHIP_MAPPING_20_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES = 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Map Key Attribute Override Container2 0</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0_FEATURE_COUNT = 1;
+
+ /**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -808,7 +836,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyClass_2_0()
* @generated
*/
- public static final int XML_MAP_KEY_CLASS_20 = 13;
+ public static final int XML_MAP_KEY_CLASS_20 = 15;
/**
* The feature id for the '<em><b>Class Name</b></em>' attribute.
@@ -836,7 +864,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapsId_2_0()
* @generated
*/
- public static final int XML_MAPS_ID_20 = 14;
+ public static final int XML_MAPS_ID_20 = 16;
/**
* The feature id for the '<em><b>Maps Id</b></em>' attribute.
@@ -864,7 +892,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlNamedQuery_2_0()
* @generated
*/
- public static final int XML_NAMED_QUERY_20 = 16;
+ public static final int XML_NAMED_QUERY_20 = 18;
/**
* The feature id for the '<em><b>Lock Mode</b></em>' attribute.
@@ -892,7 +920,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0()
* @generated
*/
- public static final int XML_ORPHAN_REMOVABLE_20 = 29;
+ public static final int XML_ORPHAN_REMOVABLE_20 = 23;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}' class.
@@ -902,7 +930,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOneToMany_2_0()
* @generated
*/
- public static final int XML_ONE_TO_MANY_20 = 17;
+ public static final int XML_ONE_TO_MANY_20 = 19;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -914,40 +942,40 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_ONE_TO_MANY_20__ORDER_COLUMN = XML_MULTI_RELATIONSHIP_MAPPING_20__ORDER_COLUMN;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_CLASS = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_TEMPORAL = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_CLASS = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_ENUMERATED = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_TEMPORAL = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_ENUMERATED = XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -993,7 +1021,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSingleRelationshipMapping_2_0()
* @generated
*/
- public static final int XML_SINGLE_RELATIONSHIP_MAPPING_20 = 25;
+ public static final int XML_SINGLE_RELATIONSHIP_MAPPING_20 = 29;
/**
* The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1030,7 +1058,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOneToOne_2_0()
* @generated
*/
- public static final int XML_ONE_TO_ONE_20 = 18;
+ public static final int XML_ONE_TO_ONE_20 = 20;
/**
* The feature id for the '<em><b>Id</b></em>' attribute.
@@ -1076,7 +1104,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrderColumn_2_0()
* @generated
*/
- public static final int XML_ORDER_COLUMN_20 = 19;
+ public static final int XML_ORDER_COLUMN_20 = 22;
/**
* The feature id for the '<em><b>Nullable</b></em>' attribute.
@@ -1122,229 +1150,229 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitDefaults_2_0()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20 = 20;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20 = 24;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlPersistenceUnitMetadata_2_0 <em>Xml Persistence Unit Metadata 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlPersistenceUnitMetadata_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitMetadata_2_0()
* @generated
- * @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20__DESCRIPTION = 0;
+ public static final int XML_PERSISTENCE_UNIT_METADATA_20 = 25;
/**
- * The feature id for the '<em><b>Delimited Identifiers</b></em>' attribute.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlQuery_2_0 <em>Xml Query 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlQuery_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlQuery_2_0()
* @generated
- * @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20__DELIMITED_IDENTIFIERS = 1;
+ public static final int XML_QUERY_20 = 26;
/**
- * The number of structural features of the '<em>Xml Persistence Unit Defaults 20</em>' class.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlQueryHint_2_0 <em>Xml Query Hint 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlQueryHint_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlQueryHint_2_0()
* @generated
- * @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20_FEATURE_COUNT = 2;
+ public static final int XML_QUERY_HINT_20 = 27;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlPersistenceUnitMetadata_2_0 <em>Xml Persistence Unit Metadata 20</em>}' class.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSequenceGenerator_2_0 <em>Xml Sequence Generator 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlPersistenceUnitMetadata_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitMetadata_2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlSequenceGenerator_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSequenceGenerator_2_0()
* @generated
*/
- public static final int XML_PERSISTENCE_UNIT_METADATA_20 = 21;
+ public static final int XML_SEQUENCE_GENERATOR_20 = 28;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0 <em>Xml Sql Result Set Mapping 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSqlResultSetMapping_2_0()
* @generated
- * @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_METADATA_20__DESCRIPTION = 0;
+ public static final int XML_SQL_RESULT_SET_MAPPING_20 = 30;
/**
- * The number of structural features of the '<em>Xml Persistence Unit Metadata 20</em>' class.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlUniqueConstraint_2_0 <em>Xml Unique Constraint 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlUniqueConstraint_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlUniqueConstraint_2_0()
* @generated
- * @ordered
*/
- public static final int XML_PERSISTENCE_UNIT_METADATA_20_FEATURE_COUNT = 1;
+ public static final int XML_UNIQUE_CONSTRAINT_20 = 31;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlQuery_2_0 <em>Xml Query 20</em>}' class.
+ * The feature id for the '<em><b>Orphan Removal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlQuery_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlQuery_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_QUERY_20 = 22;
+ public static final int XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL = 0;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
+ * The number of structural features of the '<em>Xml Orphan Removable 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_QUERY_20__DESCRIPTION = 0;
+ public static final int XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT = 1;
/**
- * The number of structural features of the '<em>Xml Query 20</em>' class.
+ * 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_20_FEATURE_COUNT = 1;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20__DESCRIPTION = 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlQueryHint_2_0 <em>Xml Query Hint 20</em>}' class.
+ * The feature id for the '<em><b>Delimited Identifiers</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlQueryHint_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlQueryHint_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_QUERY_HINT_20 = 23;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20__DELIMITED_IDENTIFIERS = 1;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
+ * The number of structural features of the '<em>Xml Persistence Unit Defaults 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_QUERY_HINT_20__DESCRIPTION = 0;
+ public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20_FEATURE_COUNT = 2;
/**
- * The number of structural features of the '<em>Xml Query Hint 20</em>' class.
+ * 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_HINT_20_FEATURE_COUNT = 1;
+ public static final int XML_PERSISTENCE_UNIT_METADATA_20__DESCRIPTION = 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSequenceGenerator_2_0 <em>Xml Sequence Generator 20</em>}' class.
+ * The number of structural features of the '<em>Xml Persistence Unit Metadata 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlSequenceGenerator_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSequenceGenerator_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_SEQUENCE_GENERATOR_20 = 24;
+ public static final int XML_PERSISTENCE_UNIT_METADATA_20_FEATURE_COUNT = 1;
/**
- * The feature id for the '<em><b>Catalog</b></em>' attribute.
+ * The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_SEQUENCE_GENERATOR_20__CATALOG = 0;
+ public static final int XML_QUERY_20__DESCRIPTION = 0;
/**
- * The feature id for the '<em><b>Schema</b></em>' attribute.
+ * The number of structural features of the '<em>Xml Query 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_SEQUENCE_GENERATOR_20__SCHEMA = 1;
+ public static final int XML_QUERY_20_FEATURE_COUNT = 1;
/**
- * The number of structural features of the '<em>Xml Sequence Generator 20</em>' class.
+ * The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_SEQUENCE_GENERATOR_20_FEATURE_COUNT = 2;
+ public static final int XML_QUERY_HINT_20__DESCRIPTION = 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0 <em>Xml Sql Result Set Mapping 20</em>}' class.
+ * The number of structural features of the '<em>Xml Query Hint 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSqlResultSetMapping_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_SQL_RESULT_SET_MAPPING_20 = 26;
+ public static final int XML_QUERY_HINT_20_FEATURE_COUNT = 1;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
+ * The feature id for the '<em><b>Catalog</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_SQL_RESULT_SET_MAPPING_20__DESCRIPTION = 0;
+ public static final int XML_SEQUENCE_GENERATOR_20__CATALOG = 0;
/**
- * The number of structural features of the '<em>Xml Sql Result Set Mapping 20</em>' class.
+ * The feature id for the '<em><b>Schema</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT = 1;
+ public static final int XML_SEQUENCE_GENERATOR_20__SCHEMA = 1;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlUniqueConstraint_2_0 <em>Xml Unique Constraint 20</em>}' class.
+ * The number of structural features of the '<em>Xml Sequence Generator 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlUniqueConstraint_2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlUniqueConstraint_2_0()
* @generated
+ * @ordered
*/
- public static final int XML_UNIQUE_CONSTRAINT_20 = 27;
+ public static final int XML_SEQUENCE_GENERATOR_20_FEATURE_COUNT = 2;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
+ * The feature id for the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_UNIQUE_CONSTRAINT_20__NAME = 0;
+ public static final int XML_SQL_RESULT_SET_MAPPING_20__DESCRIPTION = 0;
/**
- * The number of structural features of the '<em>Xml Unique Constraint 20</em>' class.
+ * The number of structural features of the '<em>Xml Sql Result Set Mapping 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_UNIQUE_CONSTRAINT_20_FEATURE_COUNT = 1;
+ public static final int XML_SQL_RESULT_SET_MAPPING_20_FEATURE_COUNT = 1;
/**
- * The feature id for the '<em><b>Orphan Removal</b></em>' attribute.
+ * The feature id for the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL = 0;
+ public static final int XML_UNIQUE_CONSTRAINT_20__NAME = 0;
/**
- * The number of structural features of the '<em>Xml Orphan Removable 20</em>' class.
+ * The number of structural features of the '<em>Xml Unique Constraint 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT = 1;
+ public static final int XML_UNIQUE_CONSTRAINT_20_FEATURE_COUNT = 1;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.LockModeType_2_0 <em>Lock Mode Type 20</em>}' enum.
@@ -1354,7 +1382,7 @@ public class OrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getLockModeType_2_0()
* @generated
*/
- public static final int LOCK_MODE_TYPE_20 = 31;
+ public static final int LOCK_MODE_TYPE_20 = 32;
/**
* <!-- begin-user-doc -->
@@ -1368,6 +1396,13 @@ public class OrmV2_0Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlMapKeyAttributeOverrideContainer2_0EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass xmlAssociationOverride_2_0EClass = null;
/**
@@ -1677,6 +1712,35 @@ public class OrmV2_0Package extends EPackageImpl
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 <em>Xml Map Key Attribute Override Container2 0</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Map Key Attribute Override Container2 0</em>'.
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0
+ * @generated
+ */
+ public EClass getXmlMapKeyAttributeOverrideContainer2_0()
+ {
+ return xmlMapKeyAttributeOverrideContainer2_0EClass;
+ }
+
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'.
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0#getMapKeyAttributeOverrides()
+ * @see #getXmlMapKeyAttributeOverrideContainer2_0()
+ * @generated
+ */
+ public EReference getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()
+ {
+ return (EReference)xmlMapKeyAttributeOverrideContainer2_0EClass.getEStructuralFeatures().get(0);
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAssociationOverride_2_0 <em>Xml Association Override 20</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1941,21 +2005,6 @@ public class OrmV2_0Package extends EPackageImpl
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyAttributeOverrides()
- * @see #getXmlElementCollection_2_0()
- * @generated
- */
- public EReference getXmlElementCollection_2_0_MapKeyAttributeOverrides()
- {
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(6);
- }
-
-
- /**
* Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyColumn <em>Map Key Column</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1966,7 +2015,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKeyColumn()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(7);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(6);
}
@@ -1981,7 +2030,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKeyJoinColumns()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(8);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(7);
}
@@ -1996,7 +2045,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_Column()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(9);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(8);
}
@@ -2011,7 +2060,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_CollectionTable()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(10);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(9);
}
@@ -2262,21 +2311,6 @@ public class OrmV2_0Package extends EPackageImpl
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyAttributeOverrides()
- * @see #getXmlMultiRelationshipMapping_2_0()
- * @generated
- */
- public EReference getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides()
- {
- return (EReference)xmlMultiRelationshipMapping_2_0EClass.getEStructuralFeatures().get(3);
- }
-
-
- /**
* Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyColumn <em>Map Key Column</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2287,7 +2321,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlMultiRelationshipMapping_2_0_MapKeyColumn()
{
- return (EReference)xmlMultiRelationshipMapping_2_0EClass.getEStructuralFeatures().get(4);
+ return (EReference)xmlMultiRelationshipMapping_2_0EClass.getEStructuralFeatures().get(3);
}
@@ -2302,7 +2336,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlMultiRelationshipMapping_2_0_MapKeyJoinColumns()
{
- return (EReference)xmlMultiRelationshipMapping_2_0EClass.getEStructuralFeatures().get(5);
+ return (EReference)xmlMultiRelationshipMapping_2_0EClass.getEStructuralFeatures().get(4);
}
@@ -2800,12 +2834,12 @@ public class OrmV2_0Package extends EPackageImpl
isCreated = true;
// Create classes and their features
- xmlAttributeMapping_2_0EClass = createEClass(XML_ATTRIBUTE_MAPPING_20);
-
xmlAssociationOverride_2_0EClass = createEClass(XML_ASSOCIATION_OVERRIDE_20);
createEAttribute(xmlAssociationOverride_2_0EClass, XML_ASSOCIATION_OVERRIDE_20__DESCRIPTION);
createEReference(xmlAssociationOverride_2_0EClass, XML_ASSOCIATION_OVERRIDE_20__JOIN_TABLE);
+ xmlAttributeMapping_2_0EClass = createEClass(XML_ATTRIBUTE_MAPPING_20);
+
xmlAttributeOverride_2_0EClass = createEClass(XML_ATTRIBUTE_OVERRIDE_20);
createEAttribute(xmlAttributeOverride_2_0EClass, XML_ATTRIBUTE_OVERRIDE_20__DESCRIPTION);
@@ -2813,6 +2847,9 @@ public class OrmV2_0Package extends EPackageImpl
createEAttribute(xmlAttributes_2_0EClass, XML_ATTRIBUTES_20__DESCRIPTION);
createEReference(xmlAttributes_2_0EClass, XML_ATTRIBUTES_20__ELEMENT_COLLECTIONS);
+ xmlCacheable_2_0EClass = createEClass(XML_CACHEABLE_20);
+ createEAttribute(xmlCacheable_2_0EClass, XML_CACHEABLE_20__CACHEABLE);
+
xmlCollectionTable_2_0EClass = createEClass(XML_COLLECTION_TABLE_20);
xmlDerivedId_2_0EClass = createEClass(XML_DERIVED_ID_20);
@@ -2825,7 +2862,6 @@ public class OrmV2_0Package extends EPackageImpl
createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS);
createEAttribute(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL);
createEAttribute(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_ENUMERATED);
- createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_ATTRIBUTE_OVERRIDES);
createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_COLUMN);
createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_JOIN_COLUMNS);
createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__COLUMN);
@@ -2846,6 +2882,9 @@ public class OrmV2_0Package extends EPackageImpl
xmlManyToMany_2_0EClass = createEClass(XML_MANY_TO_MANY_20);
+ xmlMapKeyAttributeOverrideContainer2_0EClass = createEClass(XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0);
+ createEReference(xmlMapKeyAttributeOverrideContainer2_0EClass, XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES);
+
xmlMapKeyClass_2_0EClass = createEClass(XML_MAP_KEY_CLASS_20);
createEAttribute(xmlMapKeyClass_2_0EClass, XML_MAP_KEY_CLASS_20__CLASS_NAME);
@@ -2856,7 +2895,6 @@ public class OrmV2_0Package extends EPackageImpl
createEReference(xmlMultiRelationshipMapping_2_0EClass, XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_CLASS);
createEAttribute(xmlMultiRelationshipMapping_2_0EClass, XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_TEMPORAL);
createEAttribute(xmlMultiRelationshipMapping_2_0EClass, XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED);
- createEReference(xmlMultiRelationshipMapping_2_0EClass, XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES);
createEReference(xmlMultiRelationshipMapping_2_0EClass, XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_COLUMN);
createEReference(xmlMultiRelationshipMapping_2_0EClass, XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_JOIN_COLUMNS);
@@ -2867,11 +2905,17 @@ public class OrmV2_0Package extends EPackageImpl
xmlOneToOne_2_0EClass = createEClass(XML_ONE_TO_ONE_20);
+ xmlOrderable_2_0EClass = createEClass(XML_ORDERABLE_20);
+ createEReference(xmlOrderable_2_0EClass, XML_ORDERABLE_20__ORDER_COLUMN);
+
xmlOrderColumn_2_0EClass = createEClass(XML_ORDER_COLUMN_20);
createEAttribute(xmlOrderColumn_2_0EClass, XML_ORDER_COLUMN_20__NULLABLE);
createEAttribute(xmlOrderColumn_2_0EClass, XML_ORDER_COLUMN_20__INSERTABLE);
createEAttribute(xmlOrderColumn_2_0EClass, XML_ORDER_COLUMN_20__UPDATABLE);
+ xmlOrphanRemovable_2_0EClass = createEClass(XML_ORPHAN_REMOVABLE_20);
+ createEAttribute(xmlOrphanRemovable_2_0EClass, XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL);
+
xmlPersistenceUnitDefaults_2_0EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_20);
createEAttribute(xmlPersistenceUnitDefaults_2_0EClass, XML_PERSISTENCE_UNIT_DEFAULTS_20__DESCRIPTION);
createEAttribute(xmlPersistenceUnitDefaults_2_0EClass, XML_PERSISTENCE_UNIT_DEFAULTS_20__DELIMITED_IDENTIFIERS);
@@ -2897,15 +2941,6 @@ public class OrmV2_0Package extends EPackageImpl
xmlUniqueConstraint_2_0EClass = createEClass(XML_UNIQUE_CONSTRAINT_20);
createEAttribute(xmlUniqueConstraint_2_0EClass, XML_UNIQUE_CONSTRAINT_20__NAME);
- xmlCacheable_2_0EClass = createEClass(XML_CACHEABLE_20);
- createEAttribute(xmlCacheable_2_0EClass, XML_CACHEABLE_20__CACHEABLE);
-
- xmlOrphanRemovable_2_0EClass = createEClass(XML_ORPHAN_REMOVABLE_20);
- createEAttribute(xmlOrphanRemovable_2_0EClass, XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL);
-
- xmlOrderable_2_0EClass = createEClass(XML_ORDERABLE_20);
- createEReference(xmlOrderable_2_0EClass, XML_ORDERABLE_20__ORDER_COLUMN);
-
// Create enums
lockModeType_2_0EEnum = createEEnum(LOCK_MODE_TYPE_20);
}
@@ -2935,8 +2970,8 @@ public class OrmV2_0Package extends EPackageImpl
setNsURI(eNS_URI);
// Obtain other dependent packages
- OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+ OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
// Create type parameters
@@ -2949,10 +2984,12 @@ public class OrmV2_0Package extends EPackageImpl
xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlOrderable());
xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAttributeOverrideContainer());
xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
+ xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAttributeOverrideContainer2_0());
xmlEmbedded_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
xmlEntity_2_0EClass.getESuperTypes().add(this.getXmlCacheable_2_0());
xmlManyToMany_2_0EClass.getESuperTypes().add(this.getXmlMultiRelationshipMapping_2_0());
xmlMultiRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlOrderable_2_0());
+ xmlMultiRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAttributeOverrideContainer2_0());
xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlMultiRelationshipMapping_2_0());
xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlOrphanRemovable_2_0());
xmlOneToOne_2_0EClass.getESuperTypes().add(this.getXmlSingleRelationshipMapping_2_0());
@@ -2961,12 +2998,12 @@ public class OrmV2_0Package extends EPackageImpl
xmlSingleRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlMapsId_2_0());
// Initialize classes and features; add operations and parameters
- initEClass(xmlAttributeMapping_2_0EClass, XmlAttributeMapping_2_0.class, "XmlAttributeMapping_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
initEClass(xmlAssociationOverride_2_0EClass, XmlAssociationOverride_2_0.class, "XmlAssociationOverride_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlAssociationOverride_2_0_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlAssociationOverride_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlAssociationOverride_2_0_JoinTable(), theOrmPackage.getXmlJoinTable(), null, "joinTable", null, 0, 1, XmlAssociationOverride_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlAttributeMapping_2_0EClass, XmlAttributeMapping_2_0.class, "XmlAttributeMapping_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(xmlAttributeOverride_2_0EClass, XmlAttributeOverride_2_0.class, "XmlAttributeOverride_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlAttributeOverride_2_0_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlAttributeOverride_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2974,6 +3011,9 @@ public class OrmV2_0Package extends EPackageImpl
initEAttribute(getXmlAttributes_2_0_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlAttributes_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlAttributes_2_0_ElementCollections(), theOrmPackage.getXmlElementCollection(), null, "elementCollections", null, 0, -1, XmlAttributes_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlCacheable_2_0EClass, XmlCacheable_2_0.class, "XmlCacheable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlCacheable_2_0_Cacheable(), theXMLTypePackage.getBooleanObject(), "cacheable", null, 0, 1, XmlCacheable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(xmlCollectionTable_2_0EClass, XmlCollectionTable_2_0.class, "XmlCollectionTable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlDerivedId_2_0EClass, XmlDerivedId_2_0.class, "XmlDerivedId_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2986,7 +3026,6 @@ public class OrmV2_0Package extends EPackageImpl
initEReference(getXmlElementCollection_2_0_MapKeyClass(), theOrmPackage.getXmlMapKeyClass(), null, "mapKeyClass", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlElementCollection_2_0_MapKeyTemporal(), theOrmPackage.getTemporalType(), "mapKeyTemporal", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlElementCollection_2_0_MapKeyEnumerated(), theOrmPackage.getEnumType(), "mapKeyEnumerated", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlElementCollection_2_0_MapKeyAttributeOverrides(), theOrmPackage.getXmlAttributeOverride(), null, "mapKeyAttributeOverrides", null, 0, -1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlElementCollection_2_0_MapKeyColumn(), theOrmPackage.getXmlColumn(), null, "mapKeyColumn", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlElementCollection_2_0_MapKeyJoinColumns(), theOrmPackage.getXmlJoinColumn(), null, "mapKeyJoinColumns", null, 0, -1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlElementCollection_2_0_Column(), theOrmPackage.getXmlColumn(), null, "column", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3007,6 +3046,9 @@ public class OrmV2_0Package extends EPackageImpl
initEClass(xmlManyToMany_2_0EClass, XmlManyToMany_2_0.class, "XmlManyToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(xmlMapKeyAttributeOverrideContainer2_0EClass, XmlMapKeyAttributeOverrideContainer2_0.class, "XmlMapKeyAttributeOverrideContainer2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides(), theOrmPackage.getXmlAttributeOverride(), null, "mapKeyAttributeOverrides", null, 0, -1, XmlMapKeyAttributeOverrideContainer2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(xmlMapKeyClass_2_0EClass, XmlMapKeyClass_2_0.class, "XmlMapKeyClass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlMapKeyClass_2_0_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlMapKeyClass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3017,7 +3059,6 @@ public class OrmV2_0Package extends EPackageImpl
initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyClass(), theOrmPackage.getXmlMapKeyClass(), null, "mapKeyClass", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlMultiRelationshipMapping_2_0_MapKeyTemporal(), theOrmPackage.getTemporalType(), "mapKeyTemporal", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlMultiRelationshipMapping_2_0_MapKeyEnumerated(), theOrmPackage.getEnumType(), "mapKeyEnumerated", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides(), theOrmPackage.getXmlAttributeOverride(), null, "mapKeyAttributeOverrides", null, 0, -1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyColumn(), theOrmPackage.getXmlColumn(), null, "mapKeyColumn", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyJoinColumns(), theOrmPackage.getXmlJoinColumn(), null, "mapKeyJoinColumns", null, 0, -1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3028,11 +3069,17 @@ public class OrmV2_0Package extends EPackageImpl
initEClass(xmlOneToOne_2_0EClass, XmlOneToOne_2_0.class, "XmlOneToOne_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(xmlOrderable_2_0EClass, XmlOrderable_2_0.class, "XmlOrderable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlOrderable_2_0_OrderColumn(), theOrmPackage.getXmlOrderColumn(), null, "orderColumn", null, 0, 1, XmlOrderable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(xmlOrderColumn_2_0EClass, XmlOrderColumn_2_0.class, "XmlOrderColumn_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlOrderColumn_2_0_Nullable(), theXMLTypePackage.getBooleanObject(), "nullable", null, 0, 1, XmlOrderColumn_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlOrderColumn_2_0_Insertable(), theXMLTypePackage.getBooleanObject(), "insertable", null, 0, 1, XmlOrderColumn_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlOrderColumn_2_0_Updatable(), theXMLTypePackage.getBooleanObject(), "updatable", null, 0, 1, XmlOrderColumn_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlOrphanRemovable_2_0EClass, XmlOrphanRemovable_2_0.class, "XmlOrphanRemovable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlOrphanRemovable_2_0_OrphanRemoval(), theXMLTypePackage.getBooleanObject(), "orphanRemoval", null, 0, 1, XmlOrphanRemovable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(xmlPersistenceUnitDefaults_2_0EClass, XmlPersistenceUnitDefaults_2_0.class, "XmlPersistenceUnitDefaults_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlPersistenceUnitDefaults_2_0_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlPersistenceUnitDefaults_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlPersistenceUnitDefaults_2_0_DelimitedIdentifiers(), theXMLTypePackage.getBoolean(), "delimitedIdentifiers", null, 0, 1, XmlPersistenceUnitDefaults_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3058,15 +3105,6 @@ public class OrmV2_0Package extends EPackageImpl
initEClass(xmlUniqueConstraint_2_0EClass, XmlUniqueConstraint_2_0.class, "XmlUniqueConstraint_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlUniqueConstraint_2_0_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlUniqueConstraint_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(xmlCacheable_2_0EClass, XmlCacheable_2_0.class, "XmlCacheable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getXmlCacheable_2_0_Cacheable(), theXMLTypePackage.getBooleanObject(), "cacheable", null, 0, 1, XmlCacheable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(xmlOrphanRemovable_2_0EClass, XmlOrphanRemovable_2_0.class, "XmlOrphanRemovable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getXmlOrphanRemovable_2_0_OrphanRemoval(), theXMLTypePackage.getBooleanObject(), "orphanRemoval", null, 0, 1, XmlOrphanRemovable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(xmlOrderable_2_0EClass, XmlOrderable_2_0.class, "XmlOrderable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlOrderable_2_0_OrderColumn(), theOrmPackage.getXmlOrderColumn(), null, "orderColumn", null, 0, 1, XmlOrderable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
// Initialize enums and add enum literals
initEEnum(lockModeType_2_0EEnum, LockModeType_2_0.class, "LockModeType_2_0");
addEEnumLiteral(lockModeType_2_0EEnum, LockModeType_2_0.NONE);
@@ -3104,6 +3142,24 @@ public class OrmV2_0Package extends EPackageImpl
public static final EClass XML_ATTRIBUTE_MAPPING_20 = eINSTANCE.getXmlAttributeMapping_2_0();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0 <em>Xml Map Key Attribute Override Container2 0</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0()
+ * @generated
+ */
+ public static final EClass XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0 = eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0();
+
+ /**
+ * The meta object literal for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER2_0__MAP_KEY_ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlAssociationOverride_2_0 <em>Xml Association Override 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3260,14 +3316,6 @@ public class OrmV2_0Package extends EPackageImpl
public static final EAttribute XML_ELEMENT_COLLECTION_20__MAP_KEY_ENUMERATED = eINSTANCE.getXmlElementCollection_2_0_MapKeyEnumerated();
/**
- * The meta object literal for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference XML_ELEMENT_COLLECTION_20__MAP_KEY_ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlElementCollection_2_0_MapKeyAttributeOverrides();
-
- /**
* The meta object literal for the '<em><b>Map Key Column</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3454,14 +3502,6 @@ public class OrmV2_0Package extends EPackageImpl
public static final EAttribute XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ENUMERATED = eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyEnumerated();
/**
- * The meta object literal for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference XML_MULTI_RELATIONSHIP_MAPPING_20__MAP_KEY_ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides();
-
- /**
* The meta object literal for the '<em><b>Map Key Column</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java
index bdc2ec3b51..0764c86ba6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java
@@ -17,7 +17,6 @@ import org.eclipse.jpt.core.resource.orm.FetchType;
import org.eclipse.jpt.core.resource.orm.MapKey;
import org.eclipse.jpt.core.resource.orm.TemporalType;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
@@ -30,6 +29,12 @@ import org.eclipse.jpt.core.utility.TextRange;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Element Collection 20</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>
@@ -41,7 +46,6 @@ import org.eclipse.jpt.core.utility.TextRange;
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyClass <em>Map Key Class</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
- * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyColumn <em>Map Key Column</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getColumn <em>Column</em>}</li>
@@ -53,7 +57,7 @@ import org.eclipse.jpt.core.utility.TextRange;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrderable, XmlAttributeOverrideContainer, XmlAssociationOverrideContainer
+public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrderable, XmlAttributeOverrideContainer, XmlAssociationOverrideContainer, XmlMapKeyAttributeOverrideContainer2_0
{
/**
* Returns the value of the '<em><b>Target Class</b></em>' attribute.
@@ -221,22 +225,6 @@ public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrde
void setMapKeyEnumerated(EnumType value);
/**
- * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlElementCollection_2_0_MapKeyAttributeOverrides()
- * @model containment="true"
- * @generated
- */
- EList<XmlAttributeOverride> getMapKeyAttributeOverrides();
-
- /**
* Returns the value of the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer2_0.java
new file mode 100644
index 0000000000..5455fcad80
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMapKeyAttributeOverrideContainer2_0.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.core.resource.orm.v2_0;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
+
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Map Key Attribute Override Container2 0</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.core.resource.orm.v2_0.XmlMapKeyAttributeOverrideContainer2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlMapKeyAttributeOverrideContainer2_0 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ EList<XmlAttributeOverride> getMapKeyAttributeOverrides();
+
+} // XmlMapKeyAttributeOverrideContainer2_0
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java
index 2c759d781e..d66aa63ec3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java
@@ -14,7 +14,6 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.core.resource.orm.EnumType;
import org.eclipse.jpt.core.resource.orm.TemporalType;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass;
@@ -22,6 +21,12 @@ import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Multi Relationship Mapping 20</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>
@@ -30,7 +35,6 @@ import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass;
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyClass <em>Map Key Class</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
- * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyColumn <em>Map Key Column</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
* </ul>
@@ -40,7 +44,7 @@ import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0
+public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0, XmlMapKeyAttributeOverrideContainer2_0
{
/**
* Returns the value of the '<em><b>Map Key Class</b></em>' containment reference.
@@ -127,22 +131,6 @@ public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0
void setMapKeyEnumerated(EnumType value);
/**
- * Returns the value of the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Attribute Overrides</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 Attribute Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMultiRelationshipMapping_2_0_MapKeyAttributeOverrides()
- * @model containment="true"
- * @generated
- */
- EList<XmlAttributeOverride> getMapKeyAttributeOverrides();
-
- /**
* Returns the value of the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 68d0d96d2d..653476b234 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -268,7 +268,6 @@
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0/mapKeyConvert"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlCollectionMapping_2_0/mapKeyAssociationOverrides"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlElementCollection_2_0"/>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlEntity2_0">
@@ -276,6 +275,9 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlEntity2_0/queryRedirectors"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlManyToMany_2_0"/>
+ <genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer2_0">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMapKeyAssociationOverrideContainer2_0/mapKeyAssociationOverrides"/>
+ </genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_0/XmlMappedSuperclass_2_0/cacheInterceptor"/>
</genClasses>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
index 6fb0a1bab0..5a0fa3d9c3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
@@ -312,11 +312,8 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlCollectionMapping_2_0" abstract="true"
- interface="true">
+ interface="true" eSuperTypes="#//v2_0/XmlMapKeyAssociationOverrideContainer2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mapKeyConvert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAssociationOverrides"
- upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlAssociationOverride"
- containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true"
interface="true" eSuperTypes="#//XmlAttributeMapping #//XmlConvertibleMapping #//XmlConvertersHolder #//v2_0/XmlCollectionMapping_2_0"/>
@@ -329,6 +326,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true"
interface="true" eSuperTypes="#//XmlConverterHolder #//v2_0/XmlCollectionMapping_2_0"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlMapKeyAssociationOverrideContainer2_0"
+ abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyAssociationOverrides"
+ upperBound="-1" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlAssociationOverride"
+ containment="true"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_0" abstract="true"
interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlCacheable_2_0">
<eStructuralFeatures xsi:type="ecore:EReference" name="cacheInterceptor" eType="#//v2_0/XmlCacheInterceptor2_0"
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
index 4fe936b958..789ca77057 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
@@ -57,7 +57,6 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovable2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmSingleRelationshipMapping2_0;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlElementCollection;
import org.eclipse.jpt.core.resource.orm.XmlNamedQuery;
@@ -108,8 +107,8 @@ public class EclipseLinkOrmXml2_0ContextNodeFactory extends EclipseLinkOrmXmlCon
}
@Override
- public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(OrmEmbeddedMapping2_0 parent, Owner owner, XmlAssociationOverrideContainer resourceAssociationOverrideContainer) {
- return new GenericOrmAssociationOverrideContainer(parent, owner, resourceAssociationOverrideContainer);
+ public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(OrmEmbeddedMapping2_0 parent, Owner owner) {
+ return new GenericOrmAssociationOverrideContainer(parent, owner);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/VirtualEclipseLinkXmlElementCollection2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/VirtualEclipseLinkXmlElementCollection2_0.java
index 186d794ea5..4725eb9855 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/VirtualEclipseLinkXmlElementCollection2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/VirtualEclipseLinkXmlElementCollection2_0.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.orm.EnumType;
import org.eclipse.jpt.core.resource.orm.FetchType;
import org.eclipse.jpt.core.resource.orm.MapKey;
import org.eclipse.jpt.core.resource.orm.TemporalType;
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
@@ -144,13 +145,18 @@ public class VirtualEclipseLinkXmlElementCollection2_0 extends XmlElementCollect
public TextRange getTemporalTextRange() {
return this.virtualXmlElementCollection.getTemporalTextRange();
}
-
+
@Override
public EList<XmlAttributeOverride> getAttributeOverrides() {
return this.virtualXmlElementCollection.getAttributeOverrides();
}
@Override
+ public EList<XmlAssociationOverride> getAssociationOverrides() {
+ return this.virtualXmlElementCollection.getAssociationOverrides();
+ }
+
+ @Override
public XmlAccessMethods getAccessMethods() {
return null;
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
index 253d9e0724..303ed45196 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle.
+ * Copyright (c) 2008, 2010 Oracle.
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index c3e934ad8a..28ed395dbe 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -1244,6 +1244,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES;
/**
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ /**
* The feature id for the '<em><b>Target Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1292,14 +1300,6 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES;
- /**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1420,21 +1420,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 10;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 11;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 11;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 12;
+ public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 12;
/**
* The number of structural features of the '<em>Xml Element Collection</em>' class.
* <!-- begin-user-doc -->
@@ -2573,37 +2573,37 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_MANY_TO_MANY__ORDER_BY = OrmPackage.XML_MANY_TO_MANY__ORDER_BY;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_TEMPORAL;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ENUMERATED;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_TEMPORAL;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ENUMERATED;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2653,21 +2653,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_MANY_TO_MANY__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4;
/**
* The number of structural features of the '<em>Xml Many To Many</em>' class.
* <!-- begin-user-doc -->
@@ -3267,37 +3267,37 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ONE_TO_MANY__ORDER_BY = OrmPackage.XML_ONE_TO_MANY__ORDER_BY;
/**
- * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_TEMPORAL;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS;
/**
- * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ENUMERATED;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_TEMPORAL;
/**
- * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ENUMERATED;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3371,21 +3371,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 4;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 5;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 5;
/**
* The number of structural features of the '<em>Xml One To Many</em>' class.
* <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java
index 6fd3f235e3..60e1d7fae6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlElementCollection.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.JPA;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.resource.orm.XmlCollectionTable;
import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
@@ -35,6 +34,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -170,34 +170,34 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
protected EList<XmlStructConverter> structConverters;
/**
- * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
+ * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMapKeyConvert()
+ * @see #getMapKeyAssociationOverrides()
* @generated
* @ordered
*/
- protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
+ protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
/**
- * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
+ * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getMapKeyConvert()
* @generated
* @ordered
*/
- protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
+ protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
/**
- * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
+ * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMapKeyAssociationOverrides()
+ * @see #getMapKeyConvert()
* @generated
* @ordered
*/
- protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
+ protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -671,6 +671,29 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
}
/**
+ * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
+ {
+ if (mapKeyAssociationOverrides == null)
+ {
+ mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES);
+ }
+ return mapKeyAssociationOverrides;
+ }
+
+ /**
* Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -706,29 +729,6 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
}
/**
- * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionMapping_2_0_MapKeyAssociationOverrides()
- * @model containment="true"
- * @generated
- */
- public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
- {
- if (mapKeyAssociationOverrides == null)
- {
- mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES);
- }
- return mapKeyAssociationOverrides;
- }
-
- /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -796,10 +796,10 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
return getObjectTypeConverters();
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
return getStructConverters();
- case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
- return getMapKeyConvert();
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
return getMapKeyAssociationOverrides();
+ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
+ return getMapKeyConvert();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -853,13 +853,13 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
getStructConverters().clear();
getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
return;
- case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
- setMapKeyConvert((String)newValue);
- return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
getMapKeyAssociationOverrides().clear();
getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
return;
+ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
+ setMapKeyConvert((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -907,12 +907,12 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
getStructConverters().clear();
return;
- case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
- setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
- return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
getMapKeyAssociationOverrides().clear();
return;
+ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
+ setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -949,10 +949,10 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
return objectTypeConverters != null && !objectTypeConverters.isEmpty();
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
return structConverters != null && !structConverters.isEmpty();
- case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
- return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty();
+ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
+ return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
}
return super.eIsSet(featureID);
}
@@ -1018,12 +1018,19 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlCollectionMapping_2_0.class)
{
switch (derivedFeatureID)
{
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT;
- case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES;
default: return -1;
}
}
@@ -1098,12 +1105,19 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlCollectionMapping_2_0.class)
{
switch (baseFeatureID)
{
case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT;
- case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES;
default: return -1;
}
}
@@ -1182,8 +1196,8 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
buildMapKeyTemporalTranslator(),
buildMapKeyEnumeratedTranslator(),
buildMapKeyConvertTranslator(),
- XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyAttributeOverrides()),
- XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyAssociationOverrides()),
+ buildMapKeyAttributeOverrideTranslator(),
+ buildMapKeyAssociationOverrideTranslator(),
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()),
XmlColumn.buildTranslator(JPA.COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_Column()),
@@ -1218,4 +1232,8 @@ public class XmlElementCollection extends org.eclipse.jpt.core.resource.orm.XmlE
protected static Translator buildAccessMethodsTranslator() {
return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
}
+
+ protected static Translator buildMapKeyAssociationOverrideTranslator() {
+ return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides());
+ }
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
index e967da81ff..924ad7a7ec 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlManyToMany.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2010 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,6 +20,7 @@ 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.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
@@ -28,6 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -90,34 +92,34 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
/**
- * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
+ * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMapKeyConvert()
+ * @see #getMapKeyAssociationOverrides()
* @generated
* @ordered
*/
- protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
+ protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
/**
- * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
+ * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getMapKeyConvert()
* @generated
* @ordered
*/
- protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
+ protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
/**
- * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
+ * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMapKeyAssociationOverrides()
+ * @see #getMapKeyConvert()
* @generated
* @ordered
*/
- protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
+ protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -179,6 +181,29 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
}
/**
+ * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
+ {
+ if (mapKeyAssociationOverrides == null)
+ {
+ mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES);
+ }
+ return mapKeyAssociationOverrides;
+ }
+
+ /**
* Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -214,29 +239,6 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
}
/**
- * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionMapping_2_0_MapKeyAssociationOverrides()
- * @model containment="true"
- * @generated
- */
- public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
- {
- if (mapKeyAssociationOverrides == null)
- {
- mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES);
- }
- return mapKeyAssociationOverrides;
- }
-
- /**
* Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -355,10 +357,10 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
return getProperties();
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
return getJoinFetch();
- case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
- return getMapKeyConvert();
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
return getMapKeyAssociationOverrides();
+ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
+ return getMapKeyConvert();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -384,13 +386,13 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
setJoinFetch((XmlJoinFetchType)newValue);
return;
- case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
- setMapKeyConvert((String)newValue);
- return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
getMapKeyAssociationOverrides().clear();
getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
return;
+ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
+ setMapKeyConvert((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -414,12 +416,12 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
setJoinFetch(JOIN_FETCH_EDEFAULT);
return;
- case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
- setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
- return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
getMapKeyAssociationOverrides().clear();
return;
+ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
+ setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -440,10 +442,10 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
return properties != null && !properties.isEmpty();
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
return joinFetch != JOIN_FETCH_EDEFAULT;
- case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
- return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty();
+ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
+ return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
}
return super.eIsSet(featureID);
}
@@ -487,12 +489,19 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlCollectionMapping_2_0.class)
{
switch (derivedFeatureID)
{
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT;
- case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES;
default: return -1;
}
}
@@ -538,12 +547,19 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlCollectionMapping_2_0.class)
{
switch (baseFeatureID)
{
case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT;
- case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES;
default: return -1;
}
}
@@ -618,10 +634,14 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
return new Translator(JPA2_0.MAP_KEY_CONVERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyConvert());
}
- protected static Translator buildMapKeyAssociationOverrideTranslator() {
- return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyAssociationOverrides());
+ protected static Translator buildMapKeyAttributeOverrideTranslator() {
+ return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer2_0_MapKeyAttributeOverrides());
}
+ protected static Translator buildMapKeyAssociationOverrideTranslator() {
+ return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides());
+ }
+
protected static Translator buildConverterTranslator() {
return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java
index 69e6bb6a2b..ccf903fa19 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlOneToMany.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2010 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -29,6 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0;
+import org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -111,34 +112,34 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
/**
- * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
+ * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMapKeyConvert()
+ * @see #getMapKeyAssociationOverrides()
* @generated
* @ordered
*/
- protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
+ protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
/**
- * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
+ * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getMapKeyConvert()
* @generated
* @ordered
*/
- protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
+ protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
/**
- * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
+ * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMapKeyAssociationOverrides()
+ * @see #getMapKeyConvert()
* @generated
* @ordered
*/
- protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
+ protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -235,6 +236,29 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
}
/**
+ * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
+ {
+ if (mapKeyAssociationOverrides == null)
+ {
+ mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES);
+ }
+ return mapKeyAssociationOverrides;
+ }
+
+ /**
* Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -270,29 +294,6 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
}
/**
- * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionMapping_2_0_MapKeyAssociationOverrides()
- * @model containment="true"
- * @generated
- */
- public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
- {
- if (mapKeyAssociationOverrides == null)
- {
- mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES);
- }
- return mapKeyAssociationOverrides;
- }
-
- /**
* Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -413,10 +414,10 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
return isPrivateOwned();
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
return getJoinFetch();
- case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
- return getMapKeyConvert();
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
return getMapKeyAssociationOverrides();
+ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
+ return getMapKeyConvert();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -445,13 +446,13 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
setJoinFetch((XmlJoinFetchType)newValue);
return;
- case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
- setMapKeyConvert((String)newValue);
- return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
getMapKeyAssociationOverrides().clear();
getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
return;
+ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
+ setMapKeyConvert((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -478,12 +479,12 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
setJoinFetch(JOIN_FETCH_EDEFAULT);
return;
- case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
- setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
- return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
getMapKeyAssociationOverrides().clear();
return;
+ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
+ setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -506,10 +507,10 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
return privateOwned != PRIVATE_OWNED_EDEFAULT;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
return joinFetch != JOIN_FETCH_EDEFAULT;
- case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
- return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty();
+ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
+ return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
}
return super.eIsSet(featureID);
}
@@ -561,12 +562,19 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlCollectionMapping_2_0.class)
{
switch (derivedFeatureID)
{
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT;
- case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES;
default: return -1;
}
}
@@ -620,12 +628,19 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
default: return -1;
}
}
+ if (baseClass == XmlMapKeyAssociationOverrideContainer2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES;
+ default: return -1;
+ }
+ }
if (baseClass == XmlCollectionMapping_2_0.class)
{
switch (baseFeatureID)
{
case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT;
- case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES;
default: return -1;
}
}
@@ -710,8 +725,8 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
}
protected static Translator buildMapKeyAssociationOverrideTranslator() {
- return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyAssociationOverrides());
- }
+ return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides());
+ }
protected static Translator buildConverterTranslator() {
return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
index e6b35e1f7c..326911ac5c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Oracle.
+ * Copyright (c) 2009, 2010 Oracle.
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
import org.eclipse.jpt.core.resource.orm.OrmPackage;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.xml.CommonPackage;
@@ -102,6 +101,34 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final int XML_CACHE_INTERCEPTOR2_0_FEATURE_COUNT = 1;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 <em>Xml Map Key Association Override Container2 0</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0()
+ * @generated
+ */
+ public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0 = 5;
+
+ /**
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES = 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Map Key Association Override Container2 0</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0_FEATURE_COUNT = 1;
+
+ /**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0 <em>Xml Collection Mapping 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -112,22 +139,22 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final int XML_COLLECTION_MAPPING_20 = 1;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = 0;
+ public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES = 1;
+ public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0_FEATURE_COUNT + 0;
/**
* The number of structural features of the '<em>Xml Collection Mapping 20</em>' class.
@@ -136,7 +163,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_COLLECTION_MAPPING_20_FEATURE_COUNT = 2;
+ public static final int XML_COLLECTION_MAPPING_20_FEATURE_COUNT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class.
@@ -293,22 +320,22 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION_20__STRUCT_CONVERTERS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
+ public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
/**
* The number of structural features of the '<em>Xml Element Collection 20</em>' class.
@@ -412,22 +439,22 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final int XML_MANY_TO_MANY_20__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 0;
+ public static final int XML_MANY_TO_MANY_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 1;
+ public static final int XML_MANY_TO_MANY_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Xml Many To Many 20</em>' class.
@@ -446,7 +473,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0()
* @generated
*/
- public static final int XML_MAPPED_SUPERCLASS_20 = 5;
+ public static final int XML_MAPPED_SUPERCLASS_20 = 6;
/**
* The feature id for the '<em><b>Cacheable</b></em>' attribute.
@@ -483,7 +510,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOneToMany_2_0()
* @generated
*/
- public static final int XML_ONE_TO_MANY_20 = 6;
+ public static final int XML_ONE_TO_MANY_20 = 7;
/**
* The feature id for the '<em><b>Converter</b></em>' containment reference.
@@ -522,22 +549,22 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final int XML_ONE_TO_MANY_20__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
/**
- * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
+ * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 0;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 1;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 1;
/**
* The number of structural features of the '<em>Xml One To Many 20</em>' class.
@@ -556,7 +583,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOrderColumn_2_0()
* @generated
*/
- public static final int XML_ORDER_COLUMN_20 = 7;
+ public static final int XML_ORDER_COLUMN_20 = 8;
/**
* The feature id for the '<em><b>Correction Type</b></em>' attribute.
@@ -584,7 +611,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors2_0()
* @generated
*/
- public static final int XML_QUERY_REDIRECTORS2_0 = 8;
+ public static final int XML_QUERY_REDIRECTORS2_0 = 9;
/**
* The feature id for the '<em><b>All Queries</b></em>' attribute.
@@ -666,7 +693,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getOrderCorrectionType_2_0()
* @generated
*/
- public static final int ORDER_CORRECTION_TYPE_20 = 9;
+ public static final int ORDER_CORRECTION_TYPE_20 = 10;
/**
* <!-- begin-user-doc -->
@@ -736,6 +763,13 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlMapKeyAssociationOverrideContainer2_0EClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EEnum orderCorrectionType_2_0EEnum = null;
/**
@@ -871,20 +905,6 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
}
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Map Key Association Overrides</em>'.
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyAssociationOverrides()
- * @see #getXmlCollectionMapping_2_0()
- * @generated
- */
- public EReference getXmlCollectionMapping_2_0_MapKeyAssociationOverrides()
- {
- return (EReference)xmlCollectionMapping_2_0EClass.getEStructuralFeatures().get(1);
- }
-
- /**
* Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1144,6 +1164,35 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 <em>Xml Map Key Association Override Container2 0</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Map Key Association Override Container2 0</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0
+ * @generated
+ */
+ public EClass getXmlMapKeyAssociationOverrideContainer2_0()
+ {
+ return xmlMapKeyAssociationOverrideContainer2_0EClass;
+ }
+
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Map Key Association Overrides</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0#getMapKeyAssociationOverrides()
+ * @see #getXmlMapKeyAssociationOverrideContainer2_0()
+ * @generated
+ */
+ public EReference getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()
+ {
+ return (EReference)xmlMapKeyAssociationOverrideContainer2_0EClass.getEStructuralFeatures().get(0);
+ }
+
+
+ /**
* Returns the meta object for enum '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1194,7 +1243,6 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
xmlCollectionMapping_2_0EClass = createEClass(XML_COLLECTION_MAPPING_20);
createEAttribute(xmlCollectionMapping_2_0EClass, XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT);
- createEReference(xmlCollectionMapping_2_0EClass, XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES);
xmlElementCollection_2_0EClass = createEClass(XML_ELEMENT_COLLECTION_20);
@@ -1204,6 +1252,9 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
xmlManyToMany_2_0EClass = createEClass(XML_MANY_TO_MANY_20);
+ xmlMapKeyAssociationOverrideContainer2_0EClass = createEClass(XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0);
+ createEReference(xmlMapKeyAssociationOverrideContainer2_0EClass, XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES);
+
xmlMappedSuperclass_2_0EClass = createEClass(XML_MAPPED_SUPERCLASS_20);
createEReference(xmlMappedSuperclass_2_0EClass, XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR);
@@ -1250,15 +1301,16 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
setNsURI(eNS_URI);
// Obtain other dependent packages
- OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
OrmV2_0Package theOrmV2_0Package = (OrmV2_0Package)EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI);
+ OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
// Create type parameters
// Set bounds for type parameters
// Add supertypes to classes
+ xmlCollectionMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAssociationOverrideContainer2_0());
xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAttributeMapping());
xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConvertibleMapping());
xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConvertersHolder());
@@ -1276,7 +1328,6 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
initEClass(xmlCollectionMapping_2_0EClass, XmlCollectionMapping_2_0.class, "XmlCollectionMapping_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlCollectionMapping_2_0_MapKeyConvert(), ecorePackage.getEString(), "mapKeyConvert", null, 0, 1, XmlCollectionMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlCollectionMapping_2_0_MapKeyAssociationOverrides(), theOrmPackage.getXmlAssociationOverride(), null, "mapKeyAssociationOverrides", null, 0, -1, XmlCollectionMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlElementCollection_2_0EClass, XmlElementCollection_2_0.class, "XmlElementCollection_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1286,6 +1337,9 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
initEClass(xmlManyToMany_2_0EClass, XmlManyToMany_2_0.class, "XmlManyToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(xmlMapKeyAssociationOverrideContainer2_0EClass, XmlMapKeyAssociationOverrideContainer2_0.class, "XmlMapKeyAssociationOverrideContainer2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides(), theOrmPackage.getXmlAssociationOverride(), null, "mapKeyAssociationOverrides", null, 0, -1, XmlMapKeyAssociationOverrideContainer2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
initEClass(xmlMappedSuperclass_2_0EClass, XmlMappedSuperclass_2_0.class, "XmlMappedSuperclass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlMappedSuperclass_2_0_CacheInterceptor(), this.getXmlCacheInterceptor2_0(), null, "cacheInterceptor", null, 0, 1, XmlMappedSuperclass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1361,14 +1415,6 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final EAttribute XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = eINSTANCE.getXmlCollectionMapping_2_0_MapKeyConvert();
/**
- * The meta object literal for the '<em><b>Map Key Association Overrides</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EReference XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES = eINSTANCE.getXmlCollectionMapping_2_0_MapKeyAssociationOverrides();
-
- /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1527,6 +1573,24 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
public static final EAttribute XML_QUERY_REDIRECTORS2_0__DELETE = eINSTANCE.getXmlQueryRedirectors2_0_Delete();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0 <em>Xml Map Key Association Override Container2 0</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0()
+ * @generated
+ */
+ public static final EClass XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0 = eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0();
+
+ /**
+ * The meta object literal for the '<em><b>Map Key Association Overrides</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER2_0__MAP_KEY_ASSOCIATION_OVERRIDES = eINSTANCE.getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java
index 6b62aa3c15..f6944f70fe 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Oracle.
+ * Copyright (c) 2009, 2010 Oracle.
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -11,10 +11,6 @@
package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.core.resource.xml.JpaEObject;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Collection Mapping 20</b></em>'.
@@ -30,16 +26,14 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyConvert <em>Map Key Convert</em>}</li>
- * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}</li>
* </ul>
* </p>
*
* @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCollectionMapping_2_0()
* @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
* @generated
*/
-public interface XmlCollectionMapping_2_0 extends JpaEObject
+public interface XmlCollectionMapping_2_0 extends XmlMapKeyAssociationOverrideContainer2_0
{
/**
* Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
@@ -67,20 +61,4 @@ public interface XmlCollectionMapping_2_0 extends JpaEObject
*/
void setMapKeyConvert(String value);
- /**
- * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCollectionMapping_2_0_MapKeyAssociationOverrides()
- * @model containment="true"
- * @generated
- */
- EList<XmlAssociationOverride> getMapKeyAssociationOverrides();
-
} // XmlCollectionMapping_2_0
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer2_0.java
new file mode 100644
index 0000000000..3992e2a3e0
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer2_0.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Oracle.
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
+
+import org.eclipse.jpt.core.resource.xml.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Map Key Association Override Container2 0</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.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0()
+ * @model kind="class" interface="true" abstract="true"
+ * @extends JpaEObject
+ * @generated
+ */
+public interface XmlMapKeyAssociationOverrideContainer2_0 extends JpaEObject
+{
+ /**
+ * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Map Key Association Overrides</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 Association Overrides</em>' containment reference list.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer2_0_MapKeyAssociationOverrides()
+ * @model containment="true"
+ * @generated
+ */
+ EList<XmlAssociationOverride> getMapKeyAssociationOverrides();
+
+} // XmlMapKeyAssociationOverrideContainer2_0

Back to the top