summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2013-02-18 15:49:29 (EST)
committerKaren Butzke2013-02-18 15:49:29 (EST)
commit59f56ca22f3d8ba482067637bf33e41fcfa7d942 (patch)
tree62df2645c89ea00b853461f252094217a2fb72dd
parente1ba40b17bf7d4340119ecb964755a55cc2424cc (diff)
downloadwebtools.dali-59f56ca22f3d8ba482067637bf33e41fcfa7d942.zip
webtools.dali-59f56ca22f3d8ba482067637bf33e41fcfa7d942.tar.gz
webtools.dali-59f56ca22f3d8ba482067637bf33e41fcfa7d942.tar.bz2
updated eclipselink-orm.ecore to references classes instead of interfaces
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel1
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore121
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java64
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java144
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java42
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java248
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java130
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java65
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java138
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java154
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java216
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java138
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java138
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java130
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java1
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java36
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java45
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java42
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java58
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java38
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java27
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java33
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java9
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Package.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/XmlManyToOne_2_5.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmTenantDiscriminatorColumn2_3.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java17
59 files changed, 1280 insertions, 1186 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 70ee4ea..b050792 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -266,6 +266,7 @@
<genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1">
<genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NULL"/>
<genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/ZERO"/>
+ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NEGATIVE"/>
<genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v1_1/IdValidationType_1_1/NONE"/>
</genEnums>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v1_1/XmlBasic_1_1">
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
index 45aba92..579d9c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
@@ -320,8 +320,9 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="IdValidationType_1_1">
<eLiterals name="NULL"/>
- <eLiterals name="ZERO" value="2"/>
- <eLiterals name="NONE" value="2"/>
+ <eLiterals name="ZERO" value="1"/>
+ <eLiterals name="NEGATIVE" value="2"/>
+ <eLiterals name="NONE" value="3"/>
</eClassifiers>
</eSubpackages>
<eSubpackages name="v2_0" nsURI="jpt.eclipselink.orm.v2_0.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0">
@@ -453,7 +454,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="criteria" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlBasic_2_2" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//XmlIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlBasicCollection_2_2" abstract="true"
@@ -480,37 +481,37 @@
interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAttributeOverrideContainer ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlAssociationOverrideContainer"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_2" abstract="true" interface="true"
eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
- <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//v2_2/XmlAdditionalCriteria_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//XmlAdditionalCriteria"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeOnDelete" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//XmlIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_2" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" upperBound="-1"
- eType="#//v2_2/XmlPartitioning_2_2" containment="true"/>
+ eType="#//XmlPartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="replicationPartitioning"
- upperBound="-1" eType="#//v2_2/XmlReplicationPartitioning_2_2" containment="true"/>
+ upperBound="-1" eType="#//XmlReplicationPartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="roundRobinPartitioning"
- upperBound="-1" eType="#//v2_2/XmlRoundRobinPartitioning_2_2" containment="true"/>
+ upperBound="-1" eType="#//XmlRoundRobinPartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" upperBound="-1"
- eType="#//v2_2/XmlPinnedPartitioning_2_2" containment="true"/>
+ eType="#//XmlPinnedPartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" upperBound="-1"
- eType="#//v2_2/XmlRangePartitioning_2_2" containment="true"/>
+ eType="#//XmlRangePartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" upperBound="-1"
- eType="#//v2_2/XmlValuePartitioning_2_2" containment="true"/>
+ eType="#//XmlValuePartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" upperBound="-1"
- eType="#//v2_2/XmlHashPartitioning_2_2" containment="true"/>
+ eType="#//XmlHashPartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" upperBound="-1"
- eType="#//v2_2/XmlUnionPartitioning_2_2" containment="true"/>
+ eType="#//XmlUnionPartitioning" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlHashPartitioning_2_2" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlId_2_2" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlIndex_2_2" abstract="true" interface="true">
@@ -537,7 +538,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_2" abstract="true"
interface="true" eSuperTypes="#//v2_2/XmlPartitioningGroup_2_2">
- <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//v2_2/XmlAdditionalCriteria_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="additionalCriteria" eType="#//XmlAdditionalCriteria"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_2" abstract="true" interface="true"
@@ -556,21 +557,21 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlPartitioningGroup_2_2" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" eType="#//v2_2/XmlPartitioning_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="partitioning" eType="#//XmlPartitioning"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="replicationPartitioning"
- eType="#//v2_2/XmlReplicationPartitioning_2_2" containment="true"/>
+ eType="#//XmlReplicationPartitioning" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="roundRobinPartitioning"
- eType="#//v2_2/XmlRoundRobinPartitioning_2_2" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" eType="#//v2_2/XmlPinnedPartitioning_2_2"
+ eType="#//XmlRoundRobinPartitioning" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="pinnedPartitioning" eType="#//XmlPinnedPartitioning"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" eType="#//v2_2/XmlRangePartitioning_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rangePartitioning" eType="#//XmlRangePartitioning"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" eType="#//v2_2/XmlValuePartitioning_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="valuePartitioning" eType="#//XmlValuePartitioning"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" eType="#//v2_2/XmlHashPartitioning_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="hashPartitioning" eType="#//XmlHashPartitioning"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" eType="#//v2_2/XmlUnionPartitioning_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="unionPartitioning" eType="#//XmlUnionPartitioning"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="partitioned" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
@@ -614,7 +615,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="nonCacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlVersion_2_2" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//v2_2/XmlIndex_2_2"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="index" eType="#//XmlIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="CacheIsolationType">
@@ -632,9 +633,9 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlAttributes_2_3" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="structures" upperBound="-1"
- eType="#//v2_3/XmlStructure_2_3" containment="true" resolveProxies="false"/>
+ eType="#//XmlStructure" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="arrays" upperBound="-1"
- eType="#//v2_3/XmlArray_2_3" containment="true" resolveProxies="false"/>
+ eType="#//XmlArray" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_3" abstract="true"
interface="true">
@@ -643,22 +644,22 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable_2_3" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
- eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
+ eType="#//XmlPlsqlRecord" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
eType="#//XmlPlsqlTable" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//v2_3/XmlStruct_2_3"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//XmlStruct"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_3" abstract="true" interface="true"
eSuperTypes="#//XmlMultitenantHolder">
<eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedStoredFunctionQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedPlsqlStoredFunctionQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedPlsqlStoredProcedureQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
- eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
+ eType="#//XmlPlsqlRecord" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
eType="#//XmlPlsqlTable" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="struct" eType="#//v2_3/XmlStruct_2_3"
@@ -667,28 +668,28 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_3" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
- upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlTenantDiscriminatorColumn" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedStoredFunctionQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedPlsqlStoredFunctionQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedPlsqlStoredProcedureQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
- eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
+ eType="#//XmlPlsqlRecord" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
eType="#//XmlPlsqlTable" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_3" abstract="true"
interface="true" eSuperTypes="#//XmlMultitenantHolder">
<eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredFunctionQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedStoredFunctionQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedStoredFunctionQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredFunctionQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedPlsqlStoredFunctionQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedPlsqlStoredProcedureQueries"
- upperBound="-1" eType="#//v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlNamedPlsqlStoredProcedureQuery" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlRecords" upperBound="-1"
- eType="#//v2_3/XmlPlsqlRecord_2_3" containment="true"/>
+ eType="#//XmlPlsqlRecord" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="plsqlTables" upperBound="-1"
eType="#//XmlPlsqlTable" containment="true"/>
</eClassifiers>
@@ -696,7 +697,7 @@
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//v2_3/MultitenantType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
- upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlTenantDiscriminatorColumn" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedPlsqlStoredFunctionQuery_2_3"
abstract="true" interface="true">
@@ -718,7 +719,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitDefaults_2_3" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="tenantDiscriminatorColumns"
- upperBound="-1" eType="#//v2_3/XmlTenantDiscriminatorColumn_2_3" containment="true"/>
+ upperBound="-1" eType="#//XmlTenantDiscriminatorColumn" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlPlsqlRecord_2_3" abstract="true"
interface="true">
@@ -752,9 +753,9 @@
<eSubpackages name="v2_4" nsURI="jpt.eclipselink.orm.v2_4.xmi" nsPrefix="org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4">
<eClassifiers xsi:type="ecore:EClass" name="XmlBasic_2_4" abstract="true" interface="true"
eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
- <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//XmlField"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//XmlCacheIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlCache_2_4" abstract="true" interface="true">
@@ -768,29 +769,29 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlGeneratorContainer2_4" abstract="true"
interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlGeneratorContainer">
- <eStructuralFeatures xsi:type="ecore:EReference" name="uuidGenerator" eType="#//v2_4/XmlUuidGenerator_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="uuidGenerator" eType="#//XmlUuidGenerator"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_4" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//XmlField"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="deleteAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable_2_4" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//v2_4/XmlNoSql_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//XmlNoSql"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_4" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//XmlField"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_4" abstract="true" interface="true"
eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
- <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//XmlCacheIndex"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//v2_4/XmlNoSql_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="noSql" eType="#//XmlNoSql"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_4" abstract="true"
@@ -803,9 +804,9 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlId_2_4" abstract="true" interface="true"
eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
- <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//v2_4/XmlField_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="#//XmlField"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//XmlCacheIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlJoinField_2_4" abstract="true"
@@ -817,23 +818,23 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_4" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
- eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
+ eType="#//XmlJoinField" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_4" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
- eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
+ eType="#//XmlJoinField" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_4" abstract="true"
interface="true" eSuperTypes="#//v2_4/XmlGeneratorContainer2_4">
- <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//v2_4/XmlCacheIndex_2_4"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cacheIndex" eType="#//XmlCacheIndex"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlMultitenant_2_4" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="includeCriteria" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="tenantTableDiscriminator"
- eType="#//v2_4/XmlTenantTableDiscriminator_2_4" containment="true"/>
+ eType="#//XmlTenantTableDiscriminator" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlNoSql_2_4" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -843,12 +844,12 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_4" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
- eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
+ eType="#//XmlJoinField" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="deleteAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_4" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="joinFields" upperBound="-1"
- eType="#//v2_4/XmlJoinField_2_4" containment="true"/>
+ eType="#//XmlJoinField" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlTenantTableDiscriminator_2_4" abstract="true"
interface="true">
@@ -876,7 +877,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_5" abstract="true"
interface="true" eSuperTypes="../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlPrimaryKeyJoinColumnContainer">
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
- eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//v2_1/XmlForeignKey_2_1"
+ eType="ecore:EClass ../../org.eclipse.jpt.jpa.core/model/orm.ecore#//XmlForeignKey"
containment="true"/>
</eClassifiers>
</eSubpackages>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
index eb15817..d0f72e2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -69,7 +69,7 @@ public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes
* @generated
* @ordered
*/
- protected EList<XmlStructure_2_3> structures;
+ protected EList<XmlStructure> structures;
/**
* The cached value of the '{@link #getArrays() <em>Arrays</em>}' containment reference list.
@@ -79,7 +79,7 @@ public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes
* @generated
* @ordered
*/
- protected EList<XmlArray_2_3> arrays;
+ protected EList<XmlArray> arrays;
/**
* The cached value of the '{@link #getBasicCollections() <em>Basic Collections</em>}' containment reference list.
@@ -144,7 +144,7 @@ public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes
/**
* Returns the value of the '<em><b>Structures</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Structures</em>' containment reference list isn't clear,
@@ -156,18 +156,18 @@ public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes
* @model containment="true"
* @generated
*/
- public EList<XmlStructure_2_3> getStructures()
+ public EList<XmlStructure> getStructures()
{
if (structures == null)
{
- structures = new EObjectContainmentEList<XmlStructure_2_3>(XmlStructure_2_3.class, this, EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES);
+ structures = new EObjectContainmentEList<XmlStructure>(XmlStructure.class, this, EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES);
}
return structures;
}
/**
* Returns the value of the '<em><b>Arrays</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Arrays</em>' containment reference list isn't clear,
@@ -179,11 +179,11 @@ public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes
* @model containment="true"
* @generated
*/
- public EList<XmlArray_2_3> getArrays()
+ public EList<XmlArray> getArrays()
{
if (arrays == null)
{
- arrays = new EObjectContainmentEList<XmlArray_2_3>(XmlArray_2_3.class, this, EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS);
+ arrays = new EObjectContainmentEList<XmlArray>(XmlArray.class, this, EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS);
}
return arrays;
}
@@ -345,11 +345,11 @@ public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes
{
case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES:
getStructures().clear();
- getStructures().addAll((Collection<? extends XmlStructure_2_3>)newValue);
+ getStructures().addAll((Collection<? extends XmlStructure>)newValue);
return;
case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS:
getArrays().clear();
- getArrays().addAll((Collection<? extends XmlArray_2_3>)newValue);
+ getArrays().addAll((Collection<? extends XmlArray>)newValue);
return;
case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS:
getBasicCollections().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java
index a93523d..11d6524 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java
@@ -138,7 +138,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @generated
* @ordered
*/
- protected XmlIndex_2_2 index;
+ protected XmlIndex index;
/**
* The cached value of the '{@link #getUuidGenerator() <em>Uuid Generator</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @generated
* @ordered
*/
- protected XmlUuidGenerator_2_4 uuidGenerator;
+ protected XmlUuidGenerator uuidGenerator;
/**
* The cached value of the '{@link #getField() <em>Field</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @generated
* @ordered
*/
- protected XmlField_2_4 field;
+ protected XmlField field;
/**
* The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @generated
* @ordered
*/
- protected XmlCacheIndex_2_4 cacheIndex;
+ protected XmlCacheIndex cacheIndex;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -724,12 +724,12 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_2_Index()
* @model containment="true"
* @generated
*/
- public XmlIndex_2_2 getIndex()
+ public XmlIndex getIndex()
{
return index;
}
@@ -739,9 +739,9 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
+ public NotificationChain basicSetIndex(XmlIndex newIndex, NotificationChain msgs)
{
- XmlIndex_2_2 oldIndex = index;
+ XmlIndex oldIndex = index;
index = newIndex;
if (eNotificationRequired())
{
@@ -759,7 +759,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @see #getIndex()
* @generated
*/
- public void setIndex(XmlIndex_2_2 newIndex)
+ public void setIndex(XmlIndex newIndex)
{
if (newIndex != index)
{
@@ -784,12 +784,12 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_4_Field()
* @model containment="true"
* @generated
*/
- public XmlField_2_4 getField()
+ public XmlField getField()
{
return field;
}
@@ -799,9 +799,9 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs)
+ public NotificationChain basicSetField(XmlField newField, NotificationChain msgs)
{
- XmlField_2_4 oldField = field;
+ XmlField oldField = field;
field = newField;
if (eNotificationRequired())
{
@@ -819,7 +819,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @see #getField()
* @generated
*/
- public void setField(XmlField_2_4 newField)
+ public void setField(XmlField newField)
{
if (newField != field)
{
@@ -844,12 +844,12 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- public XmlCacheIndex_2_4 getCacheIndex()
+ public XmlCacheIndex getCacheIndex()
{
return cacheIndex;
}
@@ -859,9 +859,9 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
+ public NotificationChain basicSetCacheIndex(XmlCacheIndex newCacheIndex, NotificationChain msgs)
{
- XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
+ XmlCacheIndex oldCacheIndex = cacheIndex;
cacheIndex = newCacheIndex;
if (eNotificationRequired())
{
@@ -879,7 +879,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @see #getCacheIndex()
* @generated
*/
- public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
+ public void setCacheIndex(XmlCacheIndex newCacheIndex)
{
if (newCacheIndex != cacheIndex)
{
@@ -904,12 +904,12 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Uuid Generator</em>' containment reference.
- * @see #setUuidGenerator(XmlUuidGenerator_2_4)
+ * @see #setUuidGenerator(XmlUuidGenerator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator()
* @model containment="true"
* @generated
*/
- public XmlUuidGenerator_2_4 getUuidGenerator()
+ public XmlUuidGenerator getUuidGenerator()
{
return uuidGenerator;
}
@@ -919,9 +919,9 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs)
+ public NotificationChain basicSetUuidGenerator(XmlUuidGenerator newUuidGenerator, NotificationChain msgs)
{
- XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator;
+ XmlUuidGenerator oldUuidGenerator = uuidGenerator;
uuidGenerator = newUuidGenerator;
if (eNotificationRequired())
{
@@ -939,7 +939,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @see #getUuidGenerator()
* @generated
*/
- public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator)
+ public void setUuidGenerator(XmlUuidGenerator newUuidGenerator)
{
if (newUuidGenerator != uuidGenerator)
{
@@ -1155,16 +1155,16 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
setReturnUpdate((Boolean)newValue);
return;
case EclipseLinkOrmPackage.XML_BASIC__INDEX:
- setIndex((XmlIndex_2_2)newValue);
+ setIndex((XmlIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)newValue);
+ setUuidGenerator((XmlUuidGenerator)newValue);
return;
case EclipseLinkOrmPackage.XML_BASIC__FIELD:
- setField((XmlField_2_4)newValue);
+ setField((XmlField)newValue);
return;
case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)newValue);
+ setCacheIndex((XmlCacheIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -1225,16 +1225,16 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
setReturnUpdate(RETURN_UPDATE_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_BASIC__INDEX:
- setIndex((XmlIndex_2_2)null);
+ setIndex((XmlIndex)null);
return;
case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)null);
+ setUuidGenerator((XmlUuidGenerator)null);
return;
case EclipseLinkOrmPackage.XML_BASIC__FIELD:
- setField((XmlField_2_4)null);
+ setField((XmlField)null);
return;
case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)null);
+ setCacheIndex((XmlCacheIndex)null);
return;
case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)null);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java
index 4097a38..002dde0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java
@@ -209,7 +209,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -219,7 +219,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -229,7 +229,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -239,7 +239,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -249,7 +249,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -259,7 +259,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -269,7 +269,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -279,7 +279,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -369,7 +369,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected XmlField_2_4 field;
+ protected XmlField field;
/**
* The default value of the '{@link #isDeleteAll() <em>Delete All</em>}' attribute.
@@ -660,12 +660,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -675,9 +675,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -695,7 +695,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -720,12 +720,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -735,9 +735,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -755,7 +755,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -780,12 +780,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -795,9 +795,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -815,7 +815,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -840,12 +840,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -855,9 +855,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -875,7 +875,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -900,12 +900,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -915,9 +915,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -935,7 +935,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -960,12 +960,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -975,9 +975,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -995,7 +995,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -1020,12 +1020,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -1035,9 +1035,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -1055,7 +1055,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -1080,12 +1080,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -1095,9 +1095,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -1115,7 +1115,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -1280,12 +1280,12 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_4_Field()
* @model containment="true"
* @generated
*/
- public XmlField_2_4 getField()
+ public XmlField getField()
{
return field;
}
@@ -1295,9 +1295,9 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs)
+ public NotificationChain basicSetField(XmlField newField, NotificationChain msgs)
{
- XmlField_2_4 oldField = field;
+ XmlField oldField = field;
field = newField;
if (eNotificationRequired())
{
@@ -1315,7 +1315,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @see #getField()
* @generated
*/
- public void setField(XmlField_2_4 newField)
+ public void setField(XmlField newField)
{
if (newField != field)
{
@@ -1616,28 +1616,28 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
setBatchFetch((XmlBatchFetch)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED:
setPartitioned((String)newValue);
@@ -1652,7 +1652,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
setCompositeMember((String)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD:
- setField((XmlField_2_4)newValue);
+ setField((XmlField)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL:
setDeleteAll((Boolean)newValue);
@@ -1702,28 +1702,28 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
setBatchFetch((XmlBatchFetch)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
@@ -1738,7 +1738,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
setCompositeMember(COMPOSITE_MEMBER_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD:
- setField((XmlField_2_4)null);
+ setField((XmlField)null);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL:
setDeleteAll(DELETE_ALL_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java
index dcea4d6..8c42286 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java
@@ -139,7 +139,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @generated
* @ordered
*/
- protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
+ protected EList<XmlPlsqlRecord> plsqlRecords;
/**
* The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
@@ -159,7 +159,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @generated
* @ordered
*/
- protected XmlStruct_2_3 struct;
+ protected XmlStruct struct;
/**
* The cached value of the '{@link #getNoSql() <em>No Sql</em>}' containment reference.
@@ -169,7 +169,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @generated
* @ordered
*/
- protected XmlNoSql_2_4 noSql;
+ protected XmlNoSql noSql;
/**
* The cached value of the '{@link #getCustomizer() <em>Customizer</em>}' containment reference.
@@ -455,7 +455,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -467,11 +467,11 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @model containment="true"
* @generated
*/
- public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
+ public EList<XmlPlsqlRecord> getPlsqlRecords()
{
if (plsqlRecords == null)
{
- plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS);
+ plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord>(XmlPlsqlRecord.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS);
}
return plsqlRecords;
}
@@ -508,12 +508,12 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Struct</em>' containment reference.
- * @see #setStruct(XmlStruct_2_3)
+ * @see #setStruct(XmlStruct)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_3_Struct()
* @model containment="true"
* @generated
*/
- public XmlStruct_2_3 getStruct()
+ public XmlStruct getStruct()
{
return struct;
}
@@ -523,9 +523,9 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetStruct(XmlStruct_2_3 newStruct, NotificationChain msgs)
+ public NotificationChain basicSetStruct(XmlStruct newStruct, NotificationChain msgs)
{
- XmlStruct_2_3 oldStruct = struct;
+ XmlStruct oldStruct = struct;
struct = newStruct;
if (eNotificationRequired())
{
@@ -543,7 +543,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @see #getStruct()
* @generated
*/
- public void setStruct(XmlStruct_2_3 newStruct)
+ public void setStruct(XmlStruct newStruct)
{
if (newStruct != struct)
{
@@ -568,12 +568,12 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>No Sql</em>' containment reference.
- * @see #setNoSql(XmlNoSql_2_4)
+ * @see #setNoSql(XmlNoSql)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_4_NoSql()
* @model containment="true"
* @generated
*/
- public XmlNoSql_2_4 getNoSql()
+ public XmlNoSql getNoSql()
{
return noSql;
}
@@ -583,9 +583,9 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetNoSql(XmlNoSql_2_4 newNoSql, NotificationChain msgs)
+ public NotificationChain basicSetNoSql(XmlNoSql newNoSql, NotificationChain msgs)
{
- XmlNoSql_2_4 oldNoSql = noSql;
+ XmlNoSql oldNoSql = noSql;
noSql = newNoSql;
if (eNotificationRequired())
{
@@ -603,7 +603,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @see #getNoSql()
* @generated
*/
- public void setNoSql(XmlNoSql_2_4 newNoSql)
+ public void setNoSql(XmlNoSql newNoSql)
{
if (newNoSql != noSql)
{
@@ -1196,17 +1196,17 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS:
getPlsqlRecords().clear();
- getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
+ getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord>)newValue);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES:
getPlsqlTables().clear();
getPlsqlTables().addAll((Collection<? extends XmlPlsqlTable>)newValue);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
- setStruct((XmlStruct_2_3)newValue);
+ setStruct((XmlStruct)newValue);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL:
- setNoSql((XmlNoSql_2_4)newValue);
+ setNoSql((XmlNoSql)newValue);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
setCustomizer((XmlClassReference)newValue);
@@ -1279,10 +1279,10 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
getPlsqlTables().clear();
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
- setStruct((XmlStruct_2_3)null);
+ setStruct((XmlStruct)null);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL:
- setNoSql((XmlNoSql_2_4)null);
+ setNoSql((XmlNoSql)null);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
setCustomizer((XmlClassReference)null);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
index 8b99390..7cc32c9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
@@ -60,7 +60,7 @@ public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedd
* @generated
* @ordered
*/
- protected XmlField_2_4 field;
+ protected XmlField field;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -132,12 +132,12 @@ public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedd
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded_2_4_Field()
* @model containment="true"
* @generated
*/
- public XmlField_2_4 getField()
+ public XmlField getField()
{
return field;
}
@@ -147,9 +147,9 @@ public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedd
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs)
+ public NotificationChain basicSetField(XmlField newField, NotificationChain msgs)
{
- XmlField_2_4 oldField = field;
+ XmlField oldField = field;
field = newField;
if (eNotificationRequired())
{
@@ -167,7 +167,7 @@ public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedd
* @see #getField()
* @generated
*/
- public void setField(XmlField_2_4 newField)
+ public void setField(XmlField newField)
{
if (newField != field)
{
@@ -355,7 +355,7 @@ public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedd
switch (featureID)
{
case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD:
- setField((XmlField_2_4)newValue);
+ setField((XmlField)newValue);
return;
case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -382,7 +382,7 @@ public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedd
switch (featureID)
{
case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD:
- setField((XmlField_2_4)null);
+ setField((XmlField)null);
return;
case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)null);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
index cb87f6f..cc4dcb2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
@@ -195,7 +195,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -205,7 +205,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -215,7 +215,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -225,7 +225,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -235,7 +235,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -245,7 +245,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -255,7 +255,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -265,7 +265,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -295,7 +295,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlAdditionalCriteria_2_2 additionalCriteria;
+ protected XmlAdditionalCriteria additionalCriteria;
/**
* The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
@@ -325,7 +325,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlIndex_2_2 index;
+ protected XmlIndex index;
/**
* The cached value of the '{@link #getMultitenant() <em>Multitenant</em>}' containment reference.
@@ -345,7 +345,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected EList<XmlNamedStoredFunctionQuery_2_3> namedStoredFunctionQueries;
+ protected EList<XmlNamedStoredFunctionQuery> namedStoredFunctionQueries;
/**
* The cached value of the '{@link #getNamedPlsqlStoredFunctionQueries() <em>Named Plsql Stored Function Queries</em>}' containment reference list.
@@ -355,7 +355,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected EList<XmlNamedPlsqlStoredFunctionQuery_2_3> namedPlsqlStoredFunctionQueries;
+ protected EList<XmlNamedPlsqlStoredFunctionQuery> namedPlsqlStoredFunctionQueries;
/**
* The cached value of the '{@link #getNamedPlsqlStoredProcedureQueries() <em>Named Plsql Stored Procedure Queries</em>}' containment reference list.
@@ -365,7 +365,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected EList<XmlNamedPlsqlStoredProcedureQuery_2_3> namedPlsqlStoredProcedureQueries;
+ protected EList<XmlNamedPlsqlStoredProcedureQuery> namedPlsqlStoredProcedureQueries;
/**
* The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
@@ -375,7 +375,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
+ protected EList<XmlPlsqlRecord> plsqlRecords;
/**
* The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
@@ -405,7 +405,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlUuidGenerator_2_4 uuidGenerator;
+ protected XmlUuidGenerator uuidGenerator;
/**
* The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
@@ -415,7 +415,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlCacheIndex_2_4 cacheIndex;
+ protected XmlCacheIndex cacheIndex;
/**
* The cached value of the '{@link #getNoSql() <em>No Sql</em>}' containment reference.
@@ -425,7 +425,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected XmlNoSql_2_4 noSql;
+ protected XmlNoSql noSql;
/**
* The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
@@ -1600,12 +1600,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -1615,9 +1615,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -1635,7 +1635,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -1660,12 +1660,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -1675,9 +1675,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -1695,7 +1695,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -1720,12 +1720,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -1735,9 +1735,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -1755,7 +1755,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -1780,12 +1780,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -1795,9 +1795,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -1815,7 +1815,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -1840,12 +1840,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -1855,9 +1855,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -1875,7 +1875,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -1900,12 +1900,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -1915,9 +1915,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -1935,7 +1935,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -1960,12 +1960,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -1975,9 +1975,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -1995,7 +1995,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -2020,12 +2020,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -2035,9 +2035,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -2055,7 +2055,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -2150,12 +2150,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_2_Index()
* @model containment="true"
* @generated
*/
- public XmlIndex_2_2 getIndex()
+ public XmlIndex getIndex()
{
return index;
}
@@ -2165,9 +2165,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
+ public NotificationChain basicSetIndex(XmlIndex newIndex, NotificationChain msgs)
{
- XmlIndex_2_2 oldIndex = index;
+ XmlIndex oldIndex = index;
index = newIndex;
if (eNotificationRequired())
{
@@ -2185,7 +2185,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getIndex()
* @generated
*/
- public void setIndex(XmlIndex_2_2 newIndex)
+ public void setIndex(XmlIndex newIndex)
{
if (newIndex != index)
{
@@ -2263,7 +2263,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
@@ -2275,18 +2275,18 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @model containment="true"
* @generated
*/
- public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries()
+ public EList<XmlNamedStoredFunctionQuery> getNamedStoredFunctionQueries()
{
if (namedStoredFunctionQueries == null)
{
- namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES);
+ namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery>(XmlNamedStoredFunctionQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES);
}
return namedStoredFunctionQueries;
}
/**
* Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
@@ -2298,18 +2298,18 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @model containment="true"
* @generated
*/
- public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries()
+ public EList<XmlNamedPlsqlStoredFunctionQuery> getNamedPlsqlStoredFunctionQueries()
{
if (namedPlsqlStoredFunctionQueries == null)
{
- namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
+ namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery>(XmlNamedPlsqlStoredFunctionQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
}
return namedPlsqlStoredFunctionQueries;
}
/**
* Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
@@ -2321,18 +2321,18 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @model containment="true"
* @generated
*/
- public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries()
+ public EList<XmlNamedPlsqlStoredProcedureQuery> getNamedPlsqlStoredProcedureQueries()
{
if (namedPlsqlStoredProcedureQueries == null)
{
- namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
+ namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery>(XmlNamedPlsqlStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
}
return namedPlsqlStoredProcedureQueries;
}
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -2344,11 +2344,11 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @model containment="true"
* @generated
*/
- public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
+ public EList<XmlPlsqlRecord> getPlsqlRecords()
{
if (plsqlRecords == null)
{
- plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS);
+ plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord>(XmlPlsqlRecord.class, this, EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS);
}
return plsqlRecords;
}
@@ -2445,12 +2445,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- public XmlCacheIndex_2_4 getCacheIndex()
+ public XmlCacheIndex getCacheIndex()
{
return cacheIndex;
}
@@ -2460,9 +2460,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
+ public NotificationChain basicSetCacheIndex(XmlCacheIndex newCacheIndex, NotificationChain msgs)
{
- XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
+ XmlCacheIndex oldCacheIndex = cacheIndex;
cacheIndex = newCacheIndex;
if (eNotificationRequired())
{
@@ -2480,7 +2480,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getCacheIndex()
* @generated
*/
- public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
+ public void setCacheIndex(XmlCacheIndex newCacheIndex)
{
if (newCacheIndex != cacheIndex)
{
@@ -2505,12 +2505,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>No Sql</em>' containment reference.
- * @see #setNoSql(XmlNoSql_2_4)
+ * @see #setNoSql(XmlNoSql)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_4_NoSql()
* @model containment="true"
* @generated
*/
- public XmlNoSql_2_4 getNoSql()
+ public XmlNoSql getNoSql()
{
return noSql;
}
@@ -2520,9 +2520,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetNoSql(XmlNoSql_2_4 newNoSql, NotificationChain msgs)
+ public NotificationChain basicSetNoSql(XmlNoSql newNoSql, NotificationChain msgs)
{
- XmlNoSql_2_4 oldNoSql = noSql;
+ XmlNoSql oldNoSql = noSql;
noSql = newNoSql;
if (eNotificationRequired())
{
@@ -2540,7 +2540,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getNoSql()
* @generated
*/
- public void setNoSql(XmlNoSql_2_4 newNoSql)
+ public void setNoSql(XmlNoSql newNoSql)
{
if (newNoSql != noSql)
{
@@ -2565,12 +2565,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Uuid Generator</em>' containment reference.
- * @see #setUuidGenerator(XmlUuidGenerator_2_4)
+ * @see #setUuidGenerator(XmlUuidGenerator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator()
* @model containment="true"
* @generated
*/
- public XmlUuidGenerator_2_4 getUuidGenerator()
+ public XmlUuidGenerator getUuidGenerator()
{
return uuidGenerator;
}
@@ -2580,9 +2580,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs)
+ public NotificationChain basicSetUuidGenerator(XmlUuidGenerator newUuidGenerator, NotificationChain msgs)
{
- XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator;
+ XmlUuidGenerator oldUuidGenerator = uuidGenerator;
uuidGenerator = newUuidGenerator;
if (eNotificationRequired())
{
@@ -2600,7 +2600,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getUuidGenerator()
* @generated
*/
- public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator)
+ public void setUuidGenerator(XmlUuidGenerator newUuidGenerator)
{
if (newUuidGenerator != uuidGenerator)
{
@@ -2625,12 +2625,12 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Additional Criteria</em>' containment reference.
- * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
+ * @see #setAdditionalCriteria(XmlAdditionalCriteria)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_2_AdditionalCriteria()
* @model containment="true"
* @generated
*/
- public XmlAdditionalCriteria_2_2 getAdditionalCriteria()
+ public XmlAdditionalCriteria getAdditionalCriteria()
{
return additionalCriteria;
}
@@ -2640,9 +2640,9 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria, NotificationChain msgs)
+ public NotificationChain basicSetAdditionalCriteria(XmlAdditionalCriteria newAdditionalCriteria, NotificationChain msgs)
{
- XmlAdditionalCriteria_2_2 oldAdditionalCriteria = additionalCriteria;
+ XmlAdditionalCriteria oldAdditionalCriteria = additionalCriteria;
additionalCriteria = newAdditionalCriteria;
if (eNotificationRequired())
{
@@ -2660,7 +2660,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @see #getAdditionalCriteria()
* @generated
*/
- public void setAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria)
+ public void setAdditionalCriteria(XmlAdditionalCriteria newAdditionalCriteria)
{
if (newAdditionalCriteria != additionalCriteria)
{
@@ -2937,59 +2937,59 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
setClassExtractor((XmlClassReference)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED:
setPartitioned((String)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
- setAdditionalCriteria((XmlAdditionalCriteria_2_2)newValue);
+ setAdditionalCriteria((XmlAdditionalCriteria)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE:
setCascadeOnDelete((Boolean)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
- setIndex((XmlIndex_2_2)newValue);
+ setIndex((XmlIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
setMultitenant((XmlMultitenant)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES:
getNamedStoredFunctionQueries().clear();
- getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery_2_3>)newValue);
+ getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
getNamedPlsqlStoredFunctionQueries().clear();
- getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery_2_3>)newValue);
+ getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
getNamedPlsqlStoredProcedureQueries().clear();
- getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery_2_3>)newValue);
+ getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS:
getPlsqlRecords().clear();
- getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
+ getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES:
getPlsqlTables().clear();
@@ -2999,13 +2999,13 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
setStruct((XmlStruct_2_3)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)newValue);
+ setUuidGenerator((XmlUuidGenerator)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)newValue);
+ setCacheIndex((XmlCacheIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL:
- setNoSql((XmlNoSql_2_4)newValue);
+ setNoSql((XmlNoSql)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
setReadOnly((Boolean)newValue);
@@ -3093,40 +3093,40 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
setClassExtractor((XmlClassReference)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
- setAdditionalCriteria((XmlAdditionalCriteria_2_2)null);
+ setAdditionalCriteria((XmlAdditionalCriteria)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE:
setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
- setIndex((XmlIndex_2_2)null);
+ setIndex((XmlIndex)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
setMultitenant((XmlMultitenant)null);
@@ -3150,13 +3150,13 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
setStruct((XmlStruct_2_3)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)null);
+ setUuidGenerator((XmlUuidGenerator)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)null);
+ setCacheIndex((XmlCacheIndex)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL:
- setNoSql((XmlNoSql_2_4)null);
+ setNoSql((XmlNoSql)null);
return;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
setReadOnly(READ_ONLY_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
index a343845..0f45f94 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
@@ -104,7 +104,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlPartitioning_2_2> partitioning;
+ protected EList<XmlPartitioning> partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference list.
@@ -114,7 +114,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlReplicationPartitioning_2_2> replicationPartitioning;
+ protected EList<XmlReplicationPartitioning> replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference list.
@@ -124,7 +124,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlRoundRobinPartitioning_2_2> roundRobinPartitioning;
+ protected EList<XmlRoundRobinPartitioning> roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference list.
@@ -134,7 +134,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlPinnedPartitioning_2_2> pinnedPartitioning;
+ protected EList<XmlPinnedPartitioning> pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference list.
@@ -144,7 +144,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlRangePartitioning_2_2> rangePartitioning;
+ protected EList<XmlRangePartitioning> rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference list.
@@ -154,7 +154,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlValuePartitioning_2_2> valuePartitioning;
+ protected EList<XmlValuePartitioning> valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference list.
@@ -164,7 +164,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlHashPartitioning_2_2> hashPartitioning;
+ protected EList<XmlHashPartitioning> hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference list.
@@ -174,7 +174,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlUnionPartitioning_2_2> unionPartitioning;
+ protected EList<XmlUnionPartitioning> unionPartitioning;
/**
* The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list.
@@ -184,7 +184,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
+ protected EList<XmlTenantDiscriminatorColumn> tenantDiscriminatorColumns;
/**
* The cached value of the '{@link #getNamedStoredFunctionQueries() <em>Named Stored Function Queries</em>}' containment reference list.
@@ -194,7 +194,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlNamedStoredFunctionQuery_2_3> namedStoredFunctionQueries;
+ protected EList<XmlNamedStoredFunctionQuery> namedStoredFunctionQueries;
/**
* The cached value of the '{@link #getNamedPlsqlStoredFunctionQueries() <em>Named Plsql Stored Function Queries</em>}' containment reference list.
@@ -204,7 +204,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlNamedPlsqlStoredFunctionQuery_2_3> namedPlsqlStoredFunctionQueries;
+ protected EList<XmlNamedPlsqlStoredFunctionQuery> namedPlsqlStoredFunctionQueries;
/**
* The cached value of the '{@link #getNamedPlsqlStoredProcedureQueries() <em>Named Plsql Stored Procedure Queries</em>}' containment reference list.
@@ -214,7 +214,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlNamedPlsqlStoredProcedureQuery_2_3> namedPlsqlStoredProcedureQueries;
+ protected EList<XmlNamedPlsqlStoredProcedureQuery> namedPlsqlStoredProcedureQueries;
/**
* The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
@@ -224,7 +224,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @generated
* @ordered
*/
- protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
+ protected EList<XmlPlsqlRecord> plsqlRecords;
/**
* The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
@@ -359,7 +359,7 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
/**
* Returns the value of the '<em><b>Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Partitioning</em>' containment reference list isn't clear,
@@ -371,18 +371,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlPartitioning_2_2> getPartitioning()
+ public EList<XmlPartitioning> getPartitioning()
{
if (partitioning == null)
{
- partitioning = new EObjectContainmentEList<XmlPartitioning_2_2>(XmlPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING);
+ partitioning = new EObjectContainmentEList<XmlPartitioning>(XmlPartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING);
}
return partitioning;
}
/**
* Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Replication Partitioning</em>' containment reference list isn't clear,
@@ -394,18 +394,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlReplicationPartitioning_2_2> getReplicationPartitioning()
+ public EList<XmlReplicationPartitioning> getReplicationPartitioning()
{
if (replicationPartitioning == null)
{
- replicationPartitioning = new EObjectContainmentEList<XmlReplicationPartitioning_2_2>(XmlReplicationPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING);
+ replicationPartitioning = new EObjectContainmentEList<XmlReplicationPartitioning>(XmlReplicationPartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING);
}
return replicationPartitioning;
}
/**
* Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Round Robin Partitioning</em>' containment reference list isn't clear,
@@ -417,18 +417,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlRoundRobinPartitioning_2_2> getRoundRobinPartitioning()
+ public EList<XmlRoundRobinPartitioning> getRoundRobinPartitioning()
{
if (roundRobinPartitioning == null)
{
- roundRobinPartitioning = new EObjectContainmentEList<XmlRoundRobinPartitioning_2_2>(XmlRoundRobinPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING);
+ roundRobinPartitioning = new EObjectContainmentEList<XmlRoundRobinPartitioning>(XmlRoundRobinPartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING);
}
return roundRobinPartitioning;
}
/**
* Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Pinned Partitioning</em>' containment reference list isn't clear,
@@ -440,18 +440,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlPinnedPartitioning_2_2> getPinnedPartitioning()
+ public EList<XmlPinnedPartitioning> getPinnedPartitioning()
{
if (pinnedPartitioning == null)
{
- pinnedPartitioning = new EObjectContainmentEList<XmlPinnedPartitioning_2_2>(XmlPinnedPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING);
+ pinnedPartitioning = new EObjectContainmentEList<XmlPinnedPartitioning>(XmlPinnedPartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING);
}
return pinnedPartitioning;
}
/**
* Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Range Partitioning</em>' containment reference list isn't clear,
@@ -463,18 +463,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlRangePartitioning_2_2> getRangePartitioning()
+ public EList<XmlRangePartitioning> getRangePartitioning()
{
if (rangePartitioning == null)
{
- rangePartitioning = new EObjectContainmentEList<XmlRangePartitioning_2_2>(XmlRangePartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING);
+ rangePartitioning = new EObjectContainmentEList<XmlRangePartitioning>(XmlRangePartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING);
}
return rangePartitioning;
}
/**
* Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Value Partitioning</em>' containment reference list isn't clear,
@@ -486,18 +486,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlValuePartitioning_2_2> getValuePartitioning()
+ public EList<XmlValuePartitioning> getValuePartitioning()
{
if (valuePartitioning == null)
{
- valuePartitioning = new EObjectContainmentEList<XmlValuePartitioning_2_2>(XmlValuePartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING);
+ valuePartitioning = new EObjectContainmentEList<XmlValuePartitioning>(XmlValuePartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING);
}
return valuePartitioning;
}
/**
* Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Hash Partitioning</em>' containment reference list isn't clear,
@@ -509,18 +509,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlHashPartitioning_2_2> getHashPartitioning()
+ public EList<XmlHashPartitioning> getHashPartitioning()
{
if (hashPartitioning == null)
{
- hashPartitioning = new EObjectContainmentEList<XmlHashPartitioning_2_2>(XmlHashPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING);
+ hashPartitioning = new EObjectContainmentEList<XmlHashPartitioning>(XmlHashPartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING);
}
return hashPartitioning;
}
/**
* Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Union Partitioning</em>' containment reference list isn't clear,
@@ -532,18 +532,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlUnionPartitioning_2_2> getUnionPartitioning()
+ public EList<XmlUnionPartitioning> getUnionPartitioning()
{
if (unionPartitioning == null)
{
- unionPartitioning = new EObjectContainmentEList<XmlUnionPartitioning_2_2>(XmlUnionPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING);
+ unionPartitioning = new EObjectContainmentEList<XmlUnionPartitioning>(XmlUnionPartitioning.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING);
}
return unionPartitioning;
}
/**
* Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
@@ -555,18 +555,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
+ public EList<XmlTenantDiscriminatorColumn> getTenantDiscriminatorColumns()
{
if (tenantDiscriminatorColumns == null)
{
- tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS);
+ tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn>(XmlTenantDiscriminatorColumn.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS);
}
return tenantDiscriminatorColumns;
}
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
@@ -578,18 +578,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries()
+ public EList<XmlNamedStoredFunctionQuery> getNamedStoredFunctionQueries()
{
if (namedStoredFunctionQueries == null)
{
- namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES);
+ namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery>(XmlNamedStoredFunctionQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES);
}
return namedStoredFunctionQueries;
}
/**
* Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
@@ -601,18 +601,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries()
+ public EList<XmlNamedPlsqlStoredFunctionQuery> getNamedPlsqlStoredFunctionQueries()
{
if (namedPlsqlStoredFunctionQueries == null)
{
- namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
+ namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery>(XmlNamedPlsqlStoredFunctionQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
}
return namedPlsqlStoredFunctionQueries;
}
/**
* Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
@@ -624,18 +624,18 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries()
+ public EList<XmlNamedPlsqlStoredProcedureQuery> getNamedPlsqlStoredProcedureQueries()
{
if (namedPlsqlStoredProcedureQueries == null)
{
- namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
+ namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery>(XmlNamedPlsqlStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
}
return namedPlsqlStoredProcedureQueries;
}
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -647,11 +647,11 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
* @model containment="true"
* @generated
*/
- public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
+ public EList<XmlPlsqlRecord> getPlsqlRecords()
{
if (plsqlRecords == null)
{
- plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS);
+ plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord>(XmlPlsqlRecord.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS);
}
return plsqlRecords;
}
@@ -891,55 +891,55 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING:
getPartitioning().clear();
- getPartitioning().addAll((Collection<? extends XmlPartitioning_2_2>)newValue);
+ getPartitioning().addAll((Collection<? extends XmlPartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING:
getReplicationPartitioning().clear();
- getReplicationPartitioning().addAll((Collection<? extends XmlReplicationPartitioning_2_2>)newValue);
+ getReplicationPartitioning().addAll((Collection<? extends XmlReplicationPartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING:
getRoundRobinPartitioning().clear();
- getRoundRobinPartitioning().addAll((Collection<? extends XmlRoundRobinPartitioning_2_2>)newValue);
+ getRoundRobinPartitioning().addAll((Collection<? extends XmlRoundRobinPartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING:
getPinnedPartitioning().clear();
- getPinnedPartitioning().addAll((Collection<? extends XmlPinnedPartitioning_2_2>)newValue);
+ getPinnedPartitioning().addAll((Collection<? extends XmlPinnedPartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING:
getRangePartitioning().clear();
- getRangePartitioning().addAll((Collection<? extends XmlRangePartitioning_2_2>)newValue);
+ getRangePartitioning().addAll((Collection<? extends XmlRangePartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING:
getValuePartitioning().clear();
- getValuePartitioning().addAll((Collection<? extends XmlValuePartitioning_2_2>)newValue);
+ getValuePartitioning().addAll((Collection<? extends XmlValuePartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING:
getHashPartitioning().clear();
- getHashPartitioning().addAll((Collection<? extends XmlHashPartitioning_2_2>)newValue);
+ getHashPartitioning().addAll((Collection<? extends XmlHashPartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
getUnionPartitioning().clear();
- getUnionPartitioning().addAll((Collection<? extends XmlUnionPartitioning_2_2>)newValue);
+ getUnionPartitioning().addAll((Collection<? extends XmlUnionPartitioning>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
getTenantDiscriminatorColumns().clear();
- getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
+ getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
getNamedStoredFunctionQueries().clear();
- getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery_2_3>)newValue);
+ getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
getNamedPlsqlStoredFunctionQueries().clear();
- getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery_2_3>)newValue);
+ getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
getNamedPlsqlStoredProcedureQueries().clear();
- getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery_2_3>)newValue);
+ getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS:
getPlsqlRecords().clear();
- getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
+ getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES:
getPlsqlTables().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java
index e54487d..0976f36 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java
@@ -21,6 +21,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.jpa.core.resource.orm.XmlConverter;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlIndex;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1;
@@ -74,7 +75,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @generated
* @ordered
*/
- protected XmlIndex_2_2 index;
+ protected XmlIndex index;
/**
* The cached value of the '{@link #getUuidGenerator() <em>Uuid Generator</em>}' containment reference.
@@ -84,7 +85,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @generated
* @ordered
*/
- protected XmlUuidGenerator_2_4 uuidGenerator;
+ protected XmlUuidGenerator uuidGenerator;
/**
* The cached value of the '{@link #getField() <em>Field</em>}' containment reference.
@@ -94,7 +95,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @generated
* @ordered
*/
- protected XmlField_2_4 field;
+ protected XmlField field;
/**
* The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
@@ -104,7 +105,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @generated
* @ordered
*/
- protected XmlCacheIndex_2_4 cacheIndex;
+ protected XmlCacheIndex cacheIndex;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -271,12 +272,12 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_2_Index()
* @model containment="true"
* @generated
*/
- public XmlIndex_2_2 getIndex()
+ public XmlIndex getIndex()
{
return index;
}
@@ -286,9 +287,9 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
+ public NotificationChain basicSetIndex(XmlIndex newIndex, NotificationChain msgs)
{
- XmlIndex_2_2 oldIndex = index;
+ XmlIndex oldIndex = index;
index = newIndex;
if (eNotificationRequired())
{
@@ -306,7 +307,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @see #getIndex()
* @generated
*/
- public void setIndex(XmlIndex_2_2 newIndex)
+ public void setIndex(XmlIndex newIndex)
{
if (newIndex != index)
{
@@ -331,12 +332,12 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_4_Field()
* @model containment="true"
* @generated
*/
- public XmlField_2_4 getField()
+ public XmlField getField()
{
return field;
}
@@ -346,9 +347,9 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs)
+ public NotificationChain basicSetField(XmlField newField, NotificationChain msgs)
{
- XmlField_2_4 oldField = field;
+ XmlField oldField = field;
field = newField;
if (eNotificationRequired())
{
@@ -366,7 +367,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @see #getField()
* @generated
*/
- public void setField(XmlField_2_4 newField)
+ public void setField(XmlField newField)
{
if (newField != field)
{
@@ -391,12 +392,12 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- public XmlCacheIndex_2_4 getCacheIndex()
+ public XmlCacheIndex getCacheIndex()
{
return cacheIndex;
}
@@ -406,9 +407,9 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
+ public NotificationChain basicSetCacheIndex(XmlCacheIndex newCacheIndex, NotificationChain msgs)
{
- XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
+ XmlCacheIndex oldCacheIndex = cacheIndex;
cacheIndex = newCacheIndex;
if (eNotificationRequired())
{
@@ -426,7 +427,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @see #getCacheIndex()
* @generated
*/
- public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
+ public void setCacheIndex(XmlCacheIndex newCacheIndex)
{
if (newCacheIndex != cacheIndex)
{
@@ -451,12 +452,12 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Uuid Generator</em>' containment reference.
- * @see #setUuidGenerator(XmlUuidGenerator_2_4)
+ * @see #setUuidGenerator(XmlUuidGenerator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator()
* @model containment="true"
* @generated
*/
- public XmlUuidGenerator_2_4 getUuidGenerator()
+ public XmlUuidGenerator getUuidGenerator()
{
return uuidGenerator;
}
@@ -466,9 +467,9 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs)
+ public NotificationChain basicSetUuidGenerator(XmlUuidGenerator newUuidGenerator, NotificationChain msgs)
{
- XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator;
+ XmlUuidGenerator oldUuidGenerator = uuidGenerator;
uuidGenerator = newUuidGenerator;
if (eNotificationRequired())
{
@@ -486,7 +487,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @see #getUuidGenerator()
* @generated
*/
- public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator)
+ public void setUuidGenerator(XmlUuidGenerator newUuidGenerator)
{
if (newUuidGenerator != uuidGenerator)
{
@@ -796,16 +797,16 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
switch (featureID)
{
case EclipseLinkOrmPackage.XML_ID__INDEX:
- setIndex((XmlIndex_2_2)newValue);
+ setIndex((XmlIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)newValue);
+ setUuidGenerator((XmlUuidGenerator)newValue);
return;
case EclipseLinkOrmPackage.XML_ID__FIELD:
- setField((XmlField_2_4)newValue);
+ setField((XmlField)newValue);
return;
case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)newValue);
+ setCacheIndex((XmlCacheIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -851,16 +852,16 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
switch (featureID)
{
case EclipseLinkOrmPackage.XML_ID__INDEX:
- setIndex((XmlIndex_2_2)null);
+ setIndex((XmlIndex)null);
return;
case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)null);
+ setUuidGenerator((XmlUuidGenerator)null);
return;
case EclipseLinkOrmPackage.XML_ID__FIELD:
- setField((XmlField_2_4)null);
+ setField((XmlField)null);
return;
case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)null);
+ setCacheIndex((XmlCacheIndex)null);
return;
case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)null);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java
index 73ff77f..fac678f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java
@@ -151,7 +151,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -161,7 +161,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -171,7 +171,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -181,7 +181,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -191,7 +191,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -201,7 +201,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -211,7 +211,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -221,7 +221,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -291,7 +291,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected EList<XmlJoinField_2_4> joinFields;
+ protected EList<XmlJoinField> joinFields;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -627,12 +627,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -642,9 +642,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -662,7 +662,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -687,12 +687,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -702,9 +702,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -722,7 +722,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -747,12 +747,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -762,9 +762,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -782,7 +782,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -807,12 +807,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -822,9 +822,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -842,7 +842,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -867,12 +867,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -882,9 +882,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -902,7 +902,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -927,12 +927,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -942,9 +942,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -962,7 +962,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -987,12 +987,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -1002,9 +1002,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -1022,7 +1022,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -1047,12 +1047,12 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -1062,9 +1062,9 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -1082,7 +1082,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -1205,7 +1205,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -1217,11 +1217,11 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @model containment="true"
* @generated
*/
- public EList<XmlJoinField_2_4> getJoinFields()
+ public EList<XmlJoinField> getJoinFields()
{
if (joinFields == null)
{
- joinFields = new EObjectContainmentEList<XmlJoinField_2_4>(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS);
+ joinFields = new EObjectContainmentEList<XmlJoinField>(XmlJoinField.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS);
}
return joinFields;
}
@@ -1450,28 +1450,28 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
setBatchFetch((XmlBatchFetch)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED:
setPartitioned((String)newValue);
@@ -1484,7 +1484,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS:
getJoinFields().clear();
- getJoinFields().addAll((Collection<? extends XmlJoinField_2_4>)newValue);
+ getJoinFields().addAll((Collection<? extends XmlJoinField>)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -1532,28 +1532,28 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
setBatchFetch((XmlBatchFetch)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
index 9b386a5..a4f09e5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
@@ -93,7 +93,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -103,7 +103,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -113,7 +113,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -123,7 +123,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -133,7 +133,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -143,7 +143,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -153,7 +153,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -163,7 +163,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -213,7 +213,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected EList<XmlJoinField_2_4> joinFields;
+ protected EList<XmlJoinField> joinFields;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -289,7 +289,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 primaryKeyForeignKey;
+ protected XmlForeignKey primaryKeyForeignKey;
/**
* <!-- begin-user-doc -->
@@ -381,12 +381,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -396,9 +396,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -416,7 +416,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -441,12 +441,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -456,9 +456,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -476,7 +476,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -501,12 +501,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -516,9 +516,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -536,7 +536,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -561,12 +561,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -576,9 +576,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -596,7 +596,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -621,12 +621,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -636,9 +636,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -656,7 +656,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -681,12 +681,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -696,9 +696,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -716,7 +716,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -741,12 +741,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -756,9 +756,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -776,7 +776,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -801,12 +801,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -816,9 +816,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -836,7 +836,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -924,7 +924,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -936,11 +936,11 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @model containment="true"
* @generated
*/
- public EList<XmlJoinField_2_4> getJoinFields()
+ public EList<XmlJoinField> getJoinFields()
{
if (joinFields == null)
{
- joinFields = new EObjectContainmentEList<XmlJoinField_2_4>(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FIELDS);
+ joinFields = new EObjectContainmentEList<XmlJoinField>(XmlJoinField.class, this, EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FIELDS);
}
return joinFields;
}
@@ -1015,12 +1015,12 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Primary Key Foreign Key</em>' containment reference.
- * @see #setPrimaryKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setPrimaryKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne_2_5_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ public XmlForeignKey getPrimaryKeyForeignKey()
{
return primaryKeyForeignKey;
}
@@ -1030,9 +1030,9 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetPrimaryKeyForeignKey(XmlForeignKey newPrimaryKeyForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldPrimaryKeyForeignKey = primaryKeyForeignKey;
+ XmlForeignKey oldPrimaryKeyForeignKey = primaryKeyForeignKey;
primaryKeyForeignKey = newPrimaryKeyForeignKey;
if (eNotificationRequired())
{
@@ -1050,7 +1050,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ public void setPrimaryKeyForeignKey(XmlForeignKey newPrimaryKeyForeignKey)
{
if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
{
@@ -1291,28 +1291,28 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
setBatchFetch((XmlBatchFetch)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED:
setPartitioned((String)newValue);
@@ -1322,7 +1322,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FIELDS:
getJoinFields().clear();
- getJoinFields().addAll((Collection<? extends XmlJoinField_2_4>)newValue);
+ getJoinFields().addAll((Collection<? extends XmlJoinField>)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -1342,7 +1342,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setPrimaryKeyForeignKey((XmlForeignKey)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -1362,28 +1362,28 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
setBatchFetch((XmlBatchFetch)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
@@ -1410,7 +1410,7 @@ public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyT
getPrimaryKeyJoinColumns().clear();
return;
case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ setPrimaryKeyForeignKey((XmlForeignKey)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
index 95ae797..9fc2582 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
@@ -295,7 +295,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -305,7 +305,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -315,7 +315,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -325,7 +325,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -335,7 +335,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -345,7 +345,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -355,7 +355,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -365,7 +365,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -395,7 +395,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlAdditionalCriteria_2_2 additionalCriteria;
+ protected XmlAdditionalCriteria additionalCriteria;
/**
* The cached value of the '{@link #getMultitenant() <em>Multitenant</em>}' containment reference.
@@ -415,7 +415,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected EList<XmlNamedStoredFunctionQuery_2_3> namedStoredFunctionQueries;
+ protected EList<XmlNamedStoredFunctionQuery> namedStoredFunctionQueries;
/**
* The cached value of the '{@link #getNamedPlsqlStoredFunctionQueries() <em>Named Plsql Stored Function Queries</em>}' containment reference list.
@@ -425,7 +425,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected EList<XmlNamedPlsqlStoredFunctionQuery_2_3> namedPlsqlStoredFunctionQueries;
+ protected EList<XmlNamedPlsqlStoredFunctionQuery> namedPlsqlStoredFunctionQueries;
/**
* The cached value of the '{@link #getNamedPlsqlStoredProcedureQueries() <em>Named Plsql Stored Procedure Queries</em>}' containment reference list.
@@ -435,7 +435,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected EList<XmlNamedPlsqlStoredProcedureQuery_2_3> namedPlsqlStoredProcedureQueries;
+ protected EList<XmlNamedPlsqlStoredProcedureQuery> namedPlsqlStoredProcedureQueries;
/**
* The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
@@ -445,7 +445,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
+ protected EList<XmlPlsqlRecord> plsqlRecords;
/**
* The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
@@ -465,7 +465,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlUuidGenerator_2_4 uuidGenerator;
+ protected XmlUuidGenerator uuidGenerator;
/**
* The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
@@ -475,7 +475,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected XmlCacheIndex_2_4 cacheIndex;
+ protected XmlCacheIndex cacheIndex;
/**
* The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
@@ -1883,12 +1883,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -1898,9 +1898,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -1918,7 +1918,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -1943,12 +1943,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -1958,9 +1958,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -1978,7 +1978,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -2003,12 +2003,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -2018,9 +2018,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -2038,7 +2038,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -2063,12 +2063,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -2078,9 +2078,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -2098,7 +2098,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -2123,12 +2123,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -2138,9 +2138,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -2158,7 +2158,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -2183,12 +2183,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -2198,9 +2198,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -2218,7 +2218,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -2243,12 +2243,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -2258,9 +2258,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -2278,7 +2278,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -2303,12 +2303,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -2318,9 +2318,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -2338,7 +2338,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -2398,12 +2398,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Additional Criteria</em>' containment reference.
- * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
+ * @see #setAdditionalCriteria(XmlAdditionalCriteria)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_2_AdditionalCriteria()
* @model containment="true"
* @generated
*/
- public XmlAdditionalCriteria_2_2 getAdditionalCriteria()
+ public XmlAdditionalCriteria getAdditionalCriteria()
{
return additionalCriteria;
}
@@ -2413,9 +2413,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria, NotificationChain msgs)
+ public NotificationChain basicSetAdditionalCriteria(XmlAdditionalCriteria newAdditionalCriteria, NotificationChain msgs)
{
- XmlAdditionalCriteria_2_2 oldAdditionalCriteria = additionalCriteria;
+ XmlAdditionalCriteria oldAdditionalCriteria = additionalCriteria;
additionalCriteria = newAdditionalCriteria;
if (eNotificationRequired())
{
@@ -2433,7 +2433,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getAdditionalCriteria()
* @generated
*/
- public void setAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria)
+ public void setAdditionalCriteria(XmlAdditionalCriteria newAdditionalCriteria)
{
if (newAdditionalCriteria != additionalCriteria)
{
@@ -2511,7 +2511,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
@@ -2523,18 +2523,18 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @model containment="true"
* @generated
*/
- public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries()
+ public EList<XmlNamedStoredFunctionQuery> getNamedStoredFunctionQueries()
{
if (namedStoredFunctionQueries == null)
{
- namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES);
+ namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery>(XmlNamedStoredFunctionQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES);
}
return namedStoredFunctionQueries;
}
/**
* Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
@@ -2546,18 +2546,18 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @model containment="true"
* @generated
*/
- public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries()
+ public EList<XmlNamedPlsqlStoredFunctionQuery> getNamedPlsqlStoredFunctionQueries()
{
if (namedPlsqlStoredFunctionQueries == null)
{
- namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
+ namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery>(XmlNamedPlsqlStoredFunctionQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
}
return namedPlsqlStoredFunctionQueries;
}
/**
* Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
@@ -2569,18 +2569,18 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @model containment="true"
* @generated
*/
- public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries()
+ public EList<XmlNamedPlsqlStoredProcedureQuery> getNamedPlsqlStoredProcedureQueries()
{
if (namedPlsqlStoredProcedureQueries == null)
{
- namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
+ namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery>(XmlNamedPlsqlStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
}
return namedPlsqlStoredProcedureQueries;
}
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -2592,11 +2592,11 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @model containment="true"
* @generated
*/
- public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
+ public EList<XmlPlsqlRecord> getPlsqlRecords()
{
if (plsqlRecords == null)
{
- plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS);
+ plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord>(XmlPlsqlRecord.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS);
}
return plsqlRecords;
}
@@ -2633,12 +2633,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- public XmlCacheIndex_2_4 getCacheIndex()
+ public XmlCacheIndex getCacheIndex()
{
return cacheIndex;
}
@@ -2648,9 +2648,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
+ public NotificationChain basicSetCacheIndex(XmlCacheIndex newCacheIndex, NotificationChain msgs)
{
- XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
+ XmlCacheIndex oldCacheIndex = cacheIndex;
cacheIndex = newCacheIndex;
if (eNotificationRequired())
{
@@ -2668,7 +2668,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getCacheIndex()
* @generated
*/
- public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
+ public void setCacheIndex(XmlCacheIndex newCacheIndex)
{
if (newCacheIndex != cacheIndex)
{
@@ -2693,12 +2693,12 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Uuid Generator</em>' containment reference.
- * @see #setUuidGenerator(XmlUuidGenerator_2_4)
+ * @see #setUuidGenerator(XmlUuidGenerator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator()
* @model containment="true"
* @generated
*/
- public XmlUuidGenerator_2_4 getUuidGenerator()
+ public XmlUuidGenerator getUuidGenerator()
{
return uuidGenerator;
}
@@ -2708,9 +2708,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs)
+ public NotificationChain basicSetUuidGenerator(XmlUuidGenerator newUuidGenerator, NotificationChain msgs)
{
- XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator;
+ XmlUuidGenerator oldUuidGenerator = uuidGenerator;
uuidGenerator = newUuidGenerator;
if (eNotificationRequired())
{
@@ -2728,7 +2728,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @see #getUuidGenerator()
* @generated
*/
- public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator)
+ public void setUuidGenerator(XmlUuidGenerator newUuidGenerator)
{
if (newUuidGenerator != uuidGenerator)
{
@@ -3051,63 +3051,63 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
setQueryRedirectors((XmlQueryRedirectors)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED:
setPartitioned((String)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
- setAdditionalCriteria((XmlAdditionalCriteria_2_2)newValue);
+ setAdditionalCriteria((XmlAdditionalCriteria)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
setMultitenant((XmlMultitenant)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES:
getNamedStoredFunctionQueries().clear();
- getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery_2_3>)newValue);
+ getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
getNamedPlsqlStoredFunctionQueries().clear();
- getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery_2_3>)newValue);
+ getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
getNamedPlsqlStoredProcedureQueries().clear();
- getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery_2_3>)newValue);
+ getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery>)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS:
getPlsqlRecords().clear();
- getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
+ getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord>)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES:
getPlsqlTables().clear();
getPlsqlTables().addAll((Collection<? extends XmlPlsqlTable>)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)newValue);
+ setUuidGenerator((XmlUuidGenerator)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)newValue);
+ setCacheIndex((XmlCacheIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
setReadOnly((Boolean)newValue);
@@ -3219,34 +3219,34 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
setQueryRedirectors((XmlQueryRedirectors)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
- setAdditionalCriteria((XmlAdditionalCriteria_2_2)null);
+ setAdditionalCriteria((XmlAdditionalCriteria)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
setMultitenant((XmlMultitenant)null);
@@ -3267,10 +3267,10 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
getPlsqlTables().clear();
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR:
- setUuidGenerator((XmlUuidGenerator_2_4)null);
+ setUuidGenerator((XmlUuidGenerator)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
- setCacheIndex((XmlCacheIndex_2_4)null);
+ setCacheIndex((XmlCacheIndex)null);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
setReadOnly(READ_ONLY_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
index d5d3206..8bbf3fe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -69,7 +69,7 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
* @generated
* @ordered
*/
- protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
+ protected EList<XmlTenantDiscriminatorColumn> tenantDiscriminatorColumns;
/**
* The default value of the '{@link #getIncludeCriteria() <em>Include Criteria</em>}' attribute.
@@ -98,7 +98,7 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
* @generated
* @ordered
*/
- protected XmlTenantTableDiscriminator_2_4 tenantTableDiscriminator;
+ protected XmlTenantTableDiscriminator tenantTableDiscriminator;
/**
* <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
/**
* Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
@@ -173,11 +173,11 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
* @model containment="true"
* @generated
*/
- public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
+ public EList<XmlTenantDiscriminatorColumn> getTenantDiscriminatorColumns()
{
if (tenantDiscriminatorColumns == null)
{
- tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS);
+ tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn>(XmlTenantDiscriminatorColumn.class, this, EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS);
}
return tenantDiscriminatorColumns;
}
@@ -226,12 +226,12 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Tenant Table Discriminator</em>' containment reference.
- * @see #setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4)
+ * @see #setTenantTableDiscriminator(XmlTenantTableDiscriminator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant_2_4_TenantTableDiscriminator()
* @model containment="true"
* @generated
*/
- public XmlTenantTableDiscriminator_2_4 getTenantTableDiscriminator()
+ public XmlTenantTableDiscriminator getTenantTableDiscriminator()
{
return tenantTableDiscriminator;
}
@@ -241,9 +241,9 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4 newTenantTableDiscriminator, NotificationChain msgs)
+ public NotificationChain basicSetTenantTableDiscriminator(XmlTenantTableDiscriminator newTenantTableDiscriminator, NotificationChain msgs)
{
- XmlTenantTableDiscriminator_2_4 oldTenantTableDiscriminator = tenantTableDiscriminator;
+ XmlTenantTableDiscriminator oldTenantTableDiscriminator = tenantTableDiscriminator;
tenantTableDiscriminator = newTenantTableDiscriminator;
if (eNotificationRequired())
{
@@ -261,7 +261,7 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
* @see #getTenantTableDiscriminator()
* @generated
*/
- public void setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4 newTenantTableDiscriminator)
+ public void setTenantTableDiscriminator(XmlTenantTableDiscriminator newTenantTableDiscriminator)
{
if (newTenantTableDiscriminator != tenantTableDiscriminator)
{
@@ -333,13 +333,13 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
return;
case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS:
getTenantDiscriminatorColumns().clear();
- getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
+ getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn>)newValue);
return;
case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA:
setIncludeCriteria((Boolean)newValue);
return;
case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR:
- setTenantTableDiscriminator((XmlTenantTableDiscriminator_2_4)newValue);
+ setTenantTableDiscriminator((XmlTenantTableDiscriminator)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -365,7 +365,7 @@ public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_
setIncludeCriteria(INCLUDE_CRITERIA_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR:
- setTenantTableDiscriminator((XmlTenantTableDiscriminator_2_4)null);
+ setTenantTableDiscriminator((XmlTenantTableDiscriminator)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java
index b4fa7b2..7a2401f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java
@@ -150,7 +150,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -160,7 +160,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -170,7 +170,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -180,7 +180,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -190,7 +190,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -200,7 +200,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -210,7 +210,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -220,7 +220,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -290,7 +290,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected EList<XmlJoinField_2_4> joinFields;
+ protected EList<XmlJoinField> joinFields;
/**
* The default value of the '{@link #isDeleteAll() <em>Delete All</em>}' attribute.
@@ -701,12 +701,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -716,9 +716,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -736,7 +736,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -761,12 +761,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -776,9 +776,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -796,7 +796,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -821,12 +821,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -836,9 +836,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -856,7 +856,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -881,12 +881,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -896,9 +896,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -916,7 +916,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -941,12 +941,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -956,9 +956,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -976,7 +976,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -1001,12 +1001,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -1016,9 +1016,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -1036,7 +1036,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -1061,12 +1061,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -1076,9 +1076,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -1096,7 +1096,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -1121,12 +1121,12 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -1136,9 +1136,9 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -1156,7 +1156,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -1279,7 +1279,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -1291,11 +1291,11 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @model containment="true"
* @generated
*/
- public EList<XmlJoinField_2_4> getJoinFields()
+ public EList<XmlJoinField> getJoinFields()
{
if (joinFields == null)
{
- joinFields = new EObjectContainmentEList<XmlJoinField_2_4>(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS);
+ joinFields = new EObjectContainmentEList<XmlJoinField>(XmlJoinField.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS);
}
return joinFields;
}
@@ -1563,28 +1563,28 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
setBatchFetch((XmlBatchFetch)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED:
setPartitioned((String)newValue);
@@ -1597,7 +1597,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS:
getJoinFields().clear();
- getJoinFields().addAll((Collection<? extends XmlJoinField_2_4>)newValue);
+ getJoinFields().addAll((Collection<? extends XmlJoinField>)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL:
setDeleteAll((Boolean)newValue);
@@ -1651,28 +1651,28 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
setBatchFetch((XmlBatchFetch)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
index 2f35821..c9b0da1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
@@ -87,7 +87,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -97,7 +97,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -107,7 +107,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -117,7 +117,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -127,7 +127,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -137,7 +137,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -147,7 +147,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -157,7 +157,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -227,7 +227,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @generated
* @ordered
*/
- protected EList<XmlJoinField_2_4> joinFields;
+ protected EList<XmlJoinField> joinFields;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -395,12 +395,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -410,9 +410,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -430,7 +430,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -455,12 +455,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -470,9 +470,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -490,7 +490,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -515,12 +515,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -530,9 +530,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -550,7 +550,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -575,12 +575,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -590,9 +590,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -610,7 +610,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -635,12 +635,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -650,9 +650,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -670,7 +670,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -695,12 +695,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -710,9 +710,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -730,7 +730,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -755,12 +755,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -770,9 +770,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -790,7 +790,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -815,12 +815,12 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -830,9 +830,9 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -850,7 +850,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -973,7 +973,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -985,11 +985,11 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
* @model containment="true"
* @generated
*/
- public EList<XmlJoinField_2_4> getJoinFields()
+ public EList<XmlJoinField> getJoinFields()
{
if (joinFields == null)
{
- joinFields = new EObjectContainmentEList<XmlJoinField_2_4>(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS);
+ joinFields = new EObjectContainmentEList<XmlJoinField>(XmlJoinField.class, this, EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS);
}
return joinFields;
}
@@ -1288,28 +1288,28 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
setBatchFetch((XmlBatchFetch)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED:
setPartitioned((String)newValue);
@@ -1322,7 +1322,7 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS:
getJoinFields().clear();
- getJoinFields().addAll((Collection<? extends XmlJoinField_2_4>)newValue);
+ getJoinFields().addAll((Collection<? extends XmlJoinField>)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -1358,28 +1358,28 @@ public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToO
setBatchFetch((XmlBatchFetch)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
index 6e63a21..482a5e4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -66,7 +66,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
* @generated
* @ordered
*/
- protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
+ protected EList<XmlTenantDiscriminatorColumn> tenantDiscriminatorColumns;
/**
* <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
/**
* Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
@@ -163,11 +163,11 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
* @model containment="true"
* @generated
*/
- public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
+ public EList<XmlTenantDiscriminatorColumn> getTenantDiscriminatorColumns()
{
if (tenantDiscriminatorColumns == null)
{
- tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS);
+ tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn>(XmlTenantDiscriminatorColumn.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS);
}
return tenantDiscriminatorColumns;
}
@@ -224,7 +224,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resourc
return;
case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
getTenantDiscriminatorColumns().clear();
- getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
+ getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn>)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java
index 73a57b8..7f11fac 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -114,7 +114,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlPartitioning_2_2 partitioning;
+ protected XmlPartitioning partitioning;
/**
* The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
@@ -124,7 +124,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlReplicationPartitioning_2_2 replicationPartitioning;
+ protected XmlReplicationPartitioning replicationPartitioning;
/**
* The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
@@ -134,7 +134,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
+ protected XmlRoundRobinPartitioning roundRobinPartitioning;
/**
* The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
@@ -144,7 +144,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
+ protected XmlPinnedPartitioning pinnedPartitioning;
/**
* The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
@@ -154,7 +154,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlRangePartitioning_2_2 rangePartitioning;
+ protected XmlRangePartitioning rangePartitioning;
/**
* The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
@@ -164,7 +164,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlValuePartitioning_2_2 valuePartitioning;
+ protected XmlValuePartitioning valuePartitioning;
/**
* The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
@@ -174,7 +174,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlHashPartitioning_2_2 hashPartitioning;
+ protected XmlHashPartitioning hashPartitioning;
/**
* The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
@@ -184,7 +184,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlUnionPartitioning_2_2 unionPartitioning;
+ protected XmlUnionPartitioning unionPartitioning;
/**
* The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
@@ -394,12 +394,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- public XmlPartitioning_2_2 getPartitioning()
+ public XmlPartitioning getPartitioning()
{
return partitioning;
}
@@ -409,9 +409,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPartitioning(XmlPartitioning newPartitioning, NotificationChain msgs)
{
- XmlPartitioning_2_2 oldPartitioning = partitioning;
+ XmlPartitioning oldPartitioning = partitioning;
partitioning = newPartitioning;
if (eNotificationRequired())
{
@@ -429,7 +429,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getPartitioning()
* @generated
*/
- public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
+ public void setPartitioning(XmlPartitioning newPartitioning)
{
if (newPartitioning != partitioning)
{
@@ -454,12 +454,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
+ public XmlReplicationPartitioning getReplicationPartitioning()
{
return replicationPartitioning;
}
@@ -469,9 +469,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning, NotificationChain msgs)
{
- XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
+ XmlReplicationPartitioning oldReplicationPartitioning = replicationPartitioning;
replicationPartitioning = newReplicationPartitioning;
if (eNotificationRequired())
{
@@ -489,7 +489,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getReplicationPartitioning()
* @generated
*/
- public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
+ public void setReplicationPartitioning(XmlReplicationPartitioning newReplicationPartitioning)
{
if (newReplicationPartitioning != replicationPartitioning)
{
@@ -514,12 +514,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
+ public XmlRoundRobinPartitioning getRoundRobinPartitioning()
{
return roundRobinPartitioning;
}
@@ -529,9 +529,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning, NotificationChain msgs)
{
- XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
+ XmlRoundRobinPartitioning oldRoundRobinPartitioning = roundRobinPartitioning;
roundRobinPartitioning = newRoundRobinPartitioning;
if (eNotificationRequired())
{
@@ -549,7 +549,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getRoundRobinPartitioning()
* @generated
*/
- public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
+ public void setRoundRobinPartitioning(XmlRoundRobinPartitioning newRoundRobinPartitioning)
{
if (newRoundRobinPartitioning != roundRobinPartitioning)
{
@@ -574,12 +574,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
+ public XmlPinnedPartitioning getPinnedPartitioning()
{
return pinnedPartitioning;
}
@@ -589,9 +589,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning, NotificationChain msgs)
{
- XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
+ XmlPinnedPartitioning oldPinnedPartitioning = pinnedPartitioning;
pinnedPartitioning = newPinnedPartitioning;
if (eNotificationRequired())
{
@@ -609,7 +609,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getPinnedPartitioning()
* @generated
*/
- public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
+ public void setPinnedPartitioning(XmlPinnedPartitioning newPinnedPartitioning)
{
if (newPinnedPartitioning != pinnedPartitioning)
{
@@ -634,12 +634,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- public XmlRangePartitioning_2_2 getRangePartitioning()
+ public XmlRangePartitioning getRangePartitioning()
{
return rangePartitioning;
}
@@ -649,9 +649,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetRangePartitioning(XmlRangePartitioning newRangePartitioning, NotificationChain msgs)
{
- XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
+ XmlRangePartitioning oldRangePartitioning = rangePartitioning;
rangePartitioning = newRangePartitioning;
if (eNotificationRequired())
{
@@ -669,7 +669,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getRangePartitioning()
* @generated
*/
- public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
+ public void setRangePartitioning(XmlRangePartitioning newRangePartitioning)
{
if (newRangePartitioning != rangePartitioning)
{
@@ -694,12 +694,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- public XmlValuePartitioning_2_2 getValuePartitioning()
+ public XmlValuePartitioning getValuePartitioning()
{
return valuePartitioning;
}
@@ -709,9 +709,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
+ public NotificationChain basicSetValuePartitioning(XmlValuePartitioning newValuePartitioning, NotificationChain msgs)
{
- XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
+ XmlValuePartitioning oldValuePartitioning = valuePartitioning;
valuePartitioning = newValuePartitioning;
if (eNotificationRequired())
{
@@ -729,7 +729,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getValuePartitioning()
* @generated
*/
- public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
+ public void setValuePartitioning(XmlValuePartitioning newValuePartitioning)
{
if (newValuePartitioning != valuePartitioning)
{
@@ -754,12 +754,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- public XmlHashPartitioning_2_2 getHashPartitioning()
+ public XmlHashPartitioning getHashPartitioning()
{
return hashPartitioning;
}
@@ -769,9 +769,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetHashPartitioning(XmlHashPartitioning newHashPartitioning, NotificationChain msgs)
{
- XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
+ XmlHashPartitioning oldHashPartitioning = hashPartitioning;
hashPartitioning = newHashPartitioning;
if (eNotificationRequired())
{
@@ -789,7 +789,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getHashPartitioning()
* @generated
*/
- public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
+ public void setHashPartitioning(XmlHashPartitioning newHashPartitioning)
{
if (newHashPartitioning != hashPartitioning)
{
@@ -814,12 +814,12 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- public XmlUnionPartitioning_2_2 getUnionPartitioning()
+ public XmlUnionPartitioning getUnionPartitioning()
{
return unionPartitioning;
}
@@ -829,9 +829,9 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
+ public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning newUnionPartitioning, NotificationChain msgs)
{
- XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
+ XmlUnionPartitioning oldUnionPartitioning = unionPartitioning;
unionPartitioning = newUnionPartitioning;
if (eNotificationRequired())
{
@@ -849,7 +849,7 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
* @see #getUnionPartitioning()
* @generated
*/
- public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
+ public void setUnionPartitioning(XmlUnionPartitioning newUnionPartitioning)
{
if (newUnionPartitioning != unionPartitioning)
{
@@ -1068,28 +1068,28 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
setAttributeType((String)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)newValue);
+ setPartitioning((XmlPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
+ setReplicationPartitioning((XmlReplicationPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
+ setPinnedPartitioning((XmlPinnedPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)newValue);
+ setRangePartitioning((XmlRangePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)newValue);
+ setValuePartitioning((XmlValuePartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)newValue);
+ setHashPartitioning((XmlHashPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
+ setUnionPartitioning((XmlUnionPartitioning)newValue);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED:
setPartitioned((String)newValue);
@@ -1124,28 +1124,28 @@ public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements
setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
- setPartitioning((XmlPartitioning_2_2)null);
+ setPartitioning((XmlPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
- setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
+ setReplicationPartitioning((XmlReplicationPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
- setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
+ setRoundRobinPartitioning((XmlRoundRobinPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
- setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
+ setPinnedPartitioning((XmlPinnedPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
- setRangePartitioning((XmlRangePartitioning_2_2)null);
+ setRangePartitioning((XmlRangePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
- setValuePartitioning((XmlValuePartitioning_2_2)null);
+ setValuePartitioning((XmlValuePartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
- setHashPartitioning((XmlHashPartitioning_2_2)null);
+ setHashPartitioning((XmlHashPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
- setUnionPartitioning((XmlUnionPartitioning_2_2)null);
+ setUnionPartitioning((XmlUnionPartitioning)null);
return;
case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED:
setPartitioned(PARTITIONED_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java
index 72d3a71..1d6b100 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java
@@ -65,7 +65,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
* @generated
* @ordered
*/
- protected XmlIndex_2_2 index;
+ protected XmlIndex index;
/**
* The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
@@ -232,12 +232,12 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion_2_2_Index()
* @model containment="true"
* @generated
*/
- public XmlIndex_2_2 getIndex()
+ public XmlIndex getIndex()
{
return index;
}
@@ -247,9 +247,9 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
+ public NotificationChain basicSetIndex(XmlIndex newIndex, NotificationChain msgs)
{
- XmlIndex_2_2 oldIndex = index;
+ XmlIndex oldIndex = index;
index = newIndex;
if (eNotificationRequired())
{
@@ -267,7 +267,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
* @see #getIndex()
* @generated
*/
- public void setIndex(XmlIndex_2_2 newIndex)
+ public void setIndex(XmlIndex newIndex)
{
if (newIndex != index)
{
@@ -565,7 +565,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
switch (featureID)
{
case EclipseLinkOrmPackage.XML_VERSION__INDEX:
- setIndex((XmlIndex_2_2)newValue);
+ setIndex((XmlIndex)newValue);
return;
case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)newValue);
@@ -611,7 +611,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
switch (featureID)
{
case EclipseLinkOrmPackage.XML_VERSION__INDEX:
- setIndex((XmlIndex_2_2)null);
+ setIndex((XmlIndex)null);
return;
case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
setAccessMethods((XmlAccessMethods)null);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
index db4bfc7..7b3a038 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
@@ -586,6 +586,7 @@ public class EclipseLinkOrmV1_1Package extends EPackageImpl
initEEnum(idValidationType_1_1EEnum, IdValidationType_1_1.class, "IdValidationType_1_1");
addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.NULL);
addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.ZERO);
+ addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.NEGATIVE);
addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.NONE);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java
index 86526aa..4871409 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 Oracle.
+ * Copyright (c) 2009, 2013 Oracle.
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -45,9 +45,17 @@ public enum IdValidationType_1_1 implements Enumerator
* @generated
* @ordered
*/
- ZERO(2, "ZERO", "ZERO"),
+ ZERO(1, "ZERO", "ZERO"),
/**
+ * The '<em><b>NEGATIVE</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #NEGATIVE_VALUE
+ * @generated
+ * @ordered
+ */
+ NEGATIVE(2, "NEGATIVE", "NEGATIVE"), /**
* The '<em><b>NONE</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -55,7 +63,7 @@ public enum IdValidationType_1_1 implements Enumerator
* @generated
* @ordered
*/
- NONE(2, "NONE", "NONE");
+ NONE(3, "NONE", "NONE");
/**
* The '<em><b>NULL</b></em>' literal value.
@@ -85,7 +93,22 @@ public enum IdValidationType_1_1 implements Enumerator
* @generated
* @ordered
*/
- public static final int ZERO_VALUE = 2;
+ public static final int ZERO_VALUE = 1;
+
+ /**
+ * The '<em><b>NEGATIVE</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>NEGATIVE</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #NEGATIVE
+ * @model
+ * @generated
+ * @ordered
+ */
+ public static final int NEGATIVE_VALUE = 2;
/**
* The '<em><b>NONE</b></em>' literal value.
@@ -100,7 +123,7 @@ public enum IdValidationType_1_1 implements Enumerator
* @generated
* @ordered
*/
- public static final int NONE_VALUE = 2;
+ public static final int NONE_VALUE = 3;
/**
* An array of all the '<em><b>Id Validation Type 11</b></em>' enumerators.
@@ -113,6 +136,7 @@ public enum IdValidationType_1_1 implements Enumerator
{
NULL,
ZERO,
+ NEGATIVE,
NONE,
};
@@ -174,6 +198,8 @@ public enum IdValidationType_1_1 implements Enumerator
{
case NULL_VALUE: return NULL;
case ZERO_VALUE: return ZERO;
+ case NEGATIVE_VALUE: return NEGATIVE;
+ case NONE_VALUE: return NONE;
}
return null;
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
index aaeb846..645346c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
@@ -3666,6 +3666,7 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
// Obtain other dependent packages
XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+ EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
// Create type parameters
@@ -3689,7 +3690,7 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
initEAttribute(getXmlAdditionalCriteria_2_2_Criteria(), theXMLTypePackage.getString(), "criteria", null, 0, 1, XmlAdditionalCriteria_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlBasic_2_2EClass, XmlBasic_2_2.class, "XmlBasic_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlBasic_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlBasic_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlBasic_2_2_Index(), theEclipseLinkOrmPackage.getXmlIndex(), null, "index", null, 0, 1, XmlBasic_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlBasicCollection_2_2EClass, XmlBasicCollection_2_2.class, "XmlBasicCollection_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlBasicCollection_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlBasicCollection_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3710,25 +3711,25 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
initEClass(xmlEmbeddable_2_2EClass, XmlEmbeddable_2_2.class, "XmlEmbeddable_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(xmlEntity_2_2EClass, XmlEntity_2_2.class, "XmlEntity_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntity_2_2_AdditionalCriteria(), this.getXmlAdditionalCriteria_2_2(), null, "additionalCriteria", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_2_AdditionalCriteria(), theEclipseLinkOrmPackage.getXmlAdditionalCriteria(), null, "additionalCriteria", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlEntity_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_2_Index(), theEclipseLinkOrmPackage.getXmlIndex(), null, "index", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntityMappings_2_2EClass, XmlEntityMappings_2_2.class, "XmlEntityMappings_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntityMappings_2_2_Partitioning(), this.getXmlPartitioning_2_2(), null, "partitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_ReplicationPartitioning(), this.getXmlReplicationPartitioning_2_2(), null, "replicationPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_RoundRobinPartitioning(), this.getXmlRoundRobinPartitioning_2_2(), null, "roundRobinPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_PinnedPartitioning(), this.getXmlPinnedPartitioning_2_2(), null, "pinnedPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_RangePartitioning(), this.getXmlRangePartitioning_2_2(), null, "rangePartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_ValuePartitioning(), this.getXmlValuePartitioning_2_2(), null, "valuePartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_HashPartitioning(), this.getXmlHashPartitioning_2_2(), null, "hashPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_2_UnionPartitioning(), this.getXmlUnionPartitioning_2_2(), null, "unionPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_Partitioning(), theEclipseLinkOrmPackage.getXmlPartitioning(), null, "partitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_ReplicationPartitioning(), theEclipseLinkOrmPackage.getXmlReplicationPartitioning(), null, "replicationPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_RoundRobinPartitioning(), theEclipseLinkOrmPackage.getXmlRoundRobinPartitioning(), null, "roundRobinPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_PinnedPartitioning(), theEclipseLinkOrmPackage.getXmlPinnedPartitioning(), null, "pinnedPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_RangePartitioning(), theEclipseLinkOrmPackage.getXmlRangePartitioning(), null, "rangePartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_ValuePartitioning(), theEclipseLinkOrmPackage.getXmlValuePartitioning(), null, "valuePartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_HashPartitioning(), theEclipseLinkOrmPackage.getXmlHashPartitioning(), null, "hashPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_2_UnionPartitioning(), theEclipseLinkOrmPackage.getXmlUnionPartitioning(), null, "unionPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlHashPartitioning_2_2EClass, XmlHashPartitioning_2_2.class, "XmlHashPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlHashPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlHashPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlId_2_2EClass, XmlId_2_2.class, "XmlId_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlId_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlId_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlId_2_2_Index(), theOrmPackage.getXmlIndex(), null, "index", null, 0, 1, XmlId_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlIndex_2_2EClass, XmlIndex_2_2.class, "XmlIndex_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlIndex_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3749,7 +3750,7 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
initEAttribute(getXmlManyToOne_2_2_NonCacheable(), theXMLTypePackage.getBoolean(), "nonCacheable", null, 0, 1, XmlManyToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMappedSuperclass_2_2EClass, XmlMappedSuperclass_2_2.class, "XmlMappedSuperclass_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlMappedSuperclass_2_2_AdditionalCriteria(), this.getXmlAdditionalCriteria_2_2(), null, "additionalCriteria", null, 0, 1, XmlMappedSuperclass_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_2_AdditionalCriteria(), theEclipseLinkOrmPackage.getXmlAdditionalCriteria(), null, "additionalCriteria", null, 0, 1, XmlMappedSuperclass_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlOneToOne_2_2EClass, XmlOneToOne_2_2.class, "XmlOneToOne_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlOneToOne_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlOneToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3763,14 +3764,14 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
initEAttribute(getXmlPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlPartitioningGroup_2_2EClass, XmlPartitioningGroup_2_2.class, "XmlPartitioningGroup_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlPartitioningGroup_2_2_Partitioning(), this.getXmlPartitioning_2_2(), null, "partitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_ReplicationPartitioning(), this.getXmlReplicationPartitioning_2_2(), null, "replicationPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_RoundRobinPartitioning(), this.getXmlRoundRobinPartitioning_2_2(), null, "roundRobinPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_PinnedPartitioning(), this.getXmlPinnedPartitioning_2_2(), null, "pinnedPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_RangePartitioning(), this.getXmlRangePartitioning_2_2(), null, "rangePartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_ValuePartitioning(), this.getXmlValuePartitioning_2_2(), null, "valuePartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_HashPartitioning(), this.getXmlHashPartitioning_2_2(), null, "hashPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlPartitioningGroup_2_2_UnionPartitioning(), this.getXmlUnionPartitioning_2_2(), null, "unionPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_Partitioning(), theEclipseLinkOrmPackage.getXmlPartitioning(), null, "partitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_ReplicationPartitioning(), theEclipseLinkOrmPackage.getXmlReplicationPartitioning(), null, "replicationPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_RoundRobinPartitioning(), theEclipseLinkOrmPackage.getXmlRoundRobinPartitioning(), null, "roundRobinPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_PinnedPartitioning(), theEclipseLinkOrmPackage.getXmlPinnedPartitioning(), null, "pinnedPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_RangePartitioning(), theEclipseLinkOrmPackage.getXmlRangePartitioning(), null, "rangePartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_ValuePartitioning(), theEclipseLinkOrmPackage.getXmlValuePartitioning(), null, "valuePartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_HashPartitioning(), theEclipseLinkOrmPackage.getXmlHashPartitioning(), null, "hashPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPartitioningGroup_2_2_UnionPartitioning(), theEclipseLinkOrmPackage.getXmlUnionPartitioning(), null, "unionPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlPartitioningGroup_2_2_Partitioned(), theXMLTypePackage.getString(), "partitioned", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlPinnedPartitioning_2_2EClass, XmlPinnedPartitioning_2_2.class, "XmlPinnedPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3804,7 +3805,7 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl
initEAttribute(getXmlVariableOneToOne_2_2_NonCacheable(), theXMLTypePackage.getBoolean(), "nonCacheable", null, 0, 1, XmlVariableOneToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlVersion_2_2EClass, XmlVersion_2_2.class, "XmlVersion_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlVersion_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlVersion_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlVersion_2_2_Index(), theEclipseLinkOrmPackage.getXmlIndex(), null, "index", null, 0, 1, XmlVersion_2_2.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(cacheIsolationTypeEEnum, CacheIsolationType.class, "CacheIsolationType");
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
index feace3b..770b6e2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlBasic_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasic_2_2_Index()
* @model containment="true"
* @generated
*/
- XmlIndex_2_2 getIndex();
+ XmlIndex getIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2#getIndex <em>Index</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlBasic_2_2 extends EBaseObject
* @see #getIndex()
* @generated
*/
- void setIndex(XmlIndex_2_2 value);
+ void setIndex(XmlIndex value);
} // XmlBasic_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
index 045a1f6..d1ef37b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,6 +11,14 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning;
/**
* <!-- begin-user-doc -->
@@ -46,7 +54,7 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Partitioning</em>' containment reference list isn't clear,
@@ -58,11 +66,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlPartitioning_2_2> getPartitioning();
+ EList<XmlPartitioning> getPartitioning();
/**
* Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Replication Partitioning</em>' containment reference list isn't clear,
@@ -74,11 +82,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlReplicationPartitioning_2_2> getReplicationPartitioning();
+ EList<XmlReplicationPartitioning> getReplicationPartitioning();
/**
* Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Round Robin Partitioning</em>' containment reference list isn't clear,
@@ -90,11 +98,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlRoundRobinPartitioning_2_2> getRoundRobinPartitioning();
+ EList<XmlRoundRobinPartitioning> getRoundRobinPartitioning();
/**
* Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Pinned Partitioning</em>' containment reference list isn't clear,
@@ -106,11 +114,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlPinnedPartitioning_2_2> getPinnedPartitioning();
+ EList<XmlPinnedPartitioning> getPinnedPartitioning();
/**
* Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Range Partitioning</em>' containment reference list isn't clear,
@@ -122,11 +130,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlRangePartitioning_2_2> getRangePartitioning();
+ EList<XmlRangePartitioning> getRangePartitioning();
/**
* Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Value Partitioning</em>' containment reference list isn't clear,
@@ -138,11 +146,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlValuePartitioning_2_2> getValuePartitioning();
+ EList<XmlValuePartitioning> getValuePartitioning();
/**
* Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Hash Partitioning</em>' containment reference list isn't clear,
@@ -154,11 +162,11 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlHashPartitioning_2_2> getHashPartitioning();
+ EList<XmlHashPartitioning> getHashPartitioning();
/**
* Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Union Partitioning</em>' containment reference list isn't clear,
@@ -170,6 +178,6 @@ public interface XmlEntityMappings_2_2 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlUnionPartitioning_2_2> getUnionPartitioning();
+ EList<XmlUnionPartitioning> getUnionPartitioning();
} // XmlEntityMappings_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java
index cd27063..3766ceb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,9 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex;
+
/**
* <!-- begin-user-doc -->
@@ -71,12 +74,12 @@ public interface XmlEntity_2_2 extends XmlPartitioningGroup_2_2
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2_Index()
* @model containment="true"
* @generated
*/
- XmlIndex_2_2 getIndex();
+ XmlIndex getIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getIndex <em>Index</em>}' containment reference.
@@ -86,7 +89,7 @@ public interface XmlEntity_2_2 extends XmlPartitioningGroup_2_2
* @see #getIndex()
* @generated
*/
- void setIndex(XmlIndex_2_2 value);
+ void setIndex(XmlIndex value);
/**
* Returns the value of the '<em><b>Additional Criteria</b></em>' containment reference.
@@ -97,12 +100,12 @@ public interface XmlEntity_2_2 extends XmlPartitioningGroup_2_2
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Additional Criteria</em>' containment reference.
- * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
+ * @see #setAdditionalCriteria(XmlAdditionalCriteria)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2_AdditionalCriteria()
* @model containment="true"
* @generated
*/
- XmlAdditionalCriteria_2_2 getAdditionalCriteria();
+ XmlAdditionalCriteria getAdditionalCriteria();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getAdditionalCriteria <em>Additional Criteria</em>}' containment reference.
@@ -112,6 +115,6 @@ public interface XmlEntity_2_2 extends XmlPartitioningGroup_2_2
* @see #getAdditionalCriteria()
* @generated
*/
- void setAdditionalCriteria(XmlAdditionalCriteria_2_2 value);
+ void setAdditionalCriteria(XmlAdditionalCriteria value);
} // XmlEntity_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
index a050ed4..a7b8396 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
@@ -1,12 +1,16 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XmlId_2_2.java,v 1.1 2011/02/06 02:13:00 kmoore Exp $
- */
+/*******************************************************************************
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -36,12 +40,12 @@ public interface XmlId_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlId_2_2_Index()
* @model containment="true"
* @generated
*/
- XmlIndex_2_2 getIndex();
+ XmlIndex getIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2#getIndex <em>Index</em>}' containment reference.
@@ -51,6 +55,6 @@ public interface XmlId_2_2 extends EBaseObject
* @see #getIndex()
* @generated
*/
- void setIndex(XmlIndex_2_2 value);
+ void setIndex(XmlIndex value);
} // XmlId_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java
index f949aa8..d790bf3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,8 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria;
+
/**
* <!-- begin-user-doc -->
@@ -43,12 +45,12 @@ public interface XmlMappedSuperclass_2_2 extends XmlPartitioningGroup_2_2
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Additional Criteria</em>' containment reference.
- * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
+ * @see #setAdditionalCriteria(XmlAdditionalCriteria)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlMappedSuperclass_2_2_AdditionalCriteria()
* @model containment="true"
* @generated
*/
- XmlAdditionalCriteria_2_2 getAdditionalCriteria();
+ XmlAdditionalCriteria getAdditionalCriteria();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2#getAdditionalCriteria <em>Additional Criteria</em>}' containment reference.
@@ -58,6 +60,6 @@ public interface XmlMappedSuperclass_2_2 extends XmlPartitioningGroup_2_2
* @see #getAdditionalCriteria()
* @generated
*/
- void setAdditionalCriteria(XmlAdditionalCriteria_2_2 value);
+ void setAdditionalCriteria(XmlAdditionalCriteria value);
} // XmlMappedSuperclass_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
index 7ea0d3b..1a51e61 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,14 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning;
/**
* <!-- begin-user-doc -->
@@ -53,12 +61,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Partitioning</em>' containment reference.
- * @see #setPartitioning(XmlPartitioning_2_2)
+ * @see #setPartitioning(XmlPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_Partitioning()
* @model containment="true"
* @generated
*/
- XmlPartitioning_2_2 getPartitioning();
+ XmlPartitioning getPartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioning <em>Partitioning</em>}' containment reference.
@@ -68,7 +76,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getPartitioning()
* @generated
*/
- void setPartitioning(XmlPartitioning_2_2 value);
+ void setPartitioning(XmlPartitioning value);
/**
* Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
@@ -79,12 +87,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Replication Partitioning</em>' containment reference.
- * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
+ * @see #setReplicationPartitioning(XmlReplicationPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
* @model containment="true"
* @generated
*/
- XmlReplicationPartitioning_2_2 getReplicationPartitioning();
+ XmlReplicationPartitioning getReplicationPartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
@@ -94,7 +102,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getReplicationPartitioning()
* @generated
*/
- void setReplicationPartitioning(XmlReplicationPartitioning_2_2 value);
+ void setReplicationPartitioning(XmlReplicationPartitioning value);
/**
* Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
@@ -105,12 +113,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Round Robin Partitioning</em>' containment reference.
- * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
+ * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
* @model containment="true"
* @generated
*/
- XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning();
+ XmlRoundRobinPartitioning getRoundRobinPartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
@@ -120,7 +128,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getRoundRobinPartitioning()
* @generated
*/
- void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 value);
+ void setRoundRobinPartitioning(XmlRoundRobinPartitioning value);
/**
* Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
@@ -131,12 +139,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Pinned Partitioning</em>' containment reference.
- * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
+ * @see #setPinnedPartitioning(XmlPinnedPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_PinnedPartitioning()
* @model containment="true"
* @generated
*/
- XmlPinnedPartitioning_2_2 getPinnedPartitioning();
+ XmlPinnedPartitioning getPinnedPartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
@@ -146,7 +154,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getPinnedPartitioning()
* @generated
*/
- void setPinnedPartitioning(XmlPinnedPartitioning_2_2 value);
+ void setPinnedPartitioning(XmlPinnedPartitioning value);
/**
* Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
@@ -157,12 +165,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Range Partitioning</em>' containment reference.
- * @see #setRangePartitioning(XmlRangePartitioning_2_2)
+ * @see #setRangePartitioning(XmlRangePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_RangePartitioning()
* @model containment="true"
* @generated
*/
- XmlRangePartitioning_2_2 getRangePartitioning();
+ XmlRangePartitioning getRangePartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
@@ -172,7 +180,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getRangePartitioning()
* @generated
*/
- void setRangePartitioning(XmlRangePartitioning_2_2 value);
+ void setRangePartitioning(XmlRangePartitioning value);
/**
* Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
@@ -183,12 +191,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Value Partitioning</em>' containment reference.
- * @see #setValuePartitioning(XmlValuePartitioning_2_2)
+ * @see #setValuePartitioning(XmlValuePartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_ValuePartitioning()
* @model containment="true"
* @generated
*/
- XmlValuePartitioning_2_2 getValuePartitioning();
+ XmlValuePartitioning getValuePartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
@@ -198,7 +206,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getValuePartitioning()
* @generated
*/
- void setValuePartitioning(XmlValuePartitioning_2_2 value);
+ void setValuePartitioning(XmlValuePartitioning value);
/**
* Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
@@ -209,12 +217,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Hash Partitioning</em>' containment reference.
- * @see #setHashPartitioning(XmlHashPartitioning_2_2)
+ * @see #setHashPartitioning(XmlHashPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_HashPartitioning()
* @model containment="true"
* @generated
*/
- XmlHashPartitioning_2_2 getHashPartitioning();
+ XmlHashPartitioning getHashPartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
@@ -224,7 +232,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getHashPartitioning()
* @generated
*/
- void setHashPartitioning(XmlHashPartitioning_2_2 value);
+ void setHashPartitioning(XmlHashPartitioning value);
/**
* Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
@@ -235,12 +243,12 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Union Partitioning</em>' containment reference.
- * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
+ * @see #setUnionPartitioning(XmlUnionPartitioning)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_UnionPartitioning()
* @model containment="true"
* @generated
*/
- XmlUnionPartitioning_2_2 getUnionPartitioning();
+ XmlUnionPartitioning getUnionPartitioning();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
@@ -250,7 +258,7 @@ public interface XmlPartitioningGroup_2_2 extends EBaseObject
* @see #getUnionPartitioning()
* @generated
*/
- void setUnionPartitioning(XmlUnionPartitioning_2_2 value);
+ void setUnionPartitioning(XmlUnionPartitioning value);
/**
* Returns the value of the '<em><b>Partitioned</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
index 405c5cd..0f2ecff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlVersion_2_2 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Index</em>' containment reference.
- * @see #setIndex(XmlIndex_2_2)
+ * @see #setIndex(XmlIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVersion_2_2_Index()
* @model containment="true"
* @generated
*/
- XmlIndex_2_2 getIndex();
+ XmlIndex getIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2#getIndex <em>Index</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlVersion_2_2 extends EBaseObject
* @see #getIndex()
* @generated
*/
- void setIndex(XmlIndex_2_2 value);
+ void setIndex(XmlIndex value);
} // XmlVersion_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
index ae0c796..e1dcd9e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
@@ -2209,43 +2209,43 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
initEAttribute(getXmlArray_2_3_TargetClass(), theXMLTypePackage.getString(), "targetClass", null, 0, 1, XmlArray_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlAttributes_2_3EClass, XmlAttributes_2_3.class, "XmlAttributes_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlAttributes_2_3_Structures(), this.getXmlStructure_2_3(), null, "structures", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlAttributes_2_3_Arrays(), this.getXmlArray_2_3(), null, "arrays", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlAttributes_2_3_Structures(), theEclipseLinkOrmPackage.getXmlStructure(), null, "structures", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlAttributes_2_3_Arrays(), theEclipseLinkOrmPackage.getXmlArray(), null, "arrays", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlElementCollection_2_3EClass, XmlElementCollection_2_3.class, "XmlElementCollection_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlElementCollection_2_3_CompositeMember(), theXMLTypePackage.getString(), "compositeMember", null, 0, 1, XmlElementCollection_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEmbeddable_2_3EClass, XmlEmbeddable_2_3.class, "XmlEmbeddable_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEmbeddable_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEmbeddable_2_3_PlsqlRecords(), theEclipseLinkOrmPackage.getXmlPlsqlRecord(), null, "plsqlRecords", null, 0, -1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEmbeddable_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEmbeddable_2_3_Struct(), this.getXmlStruct_2_3(), null, "struct", null, 0, 1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEmbeddable_2_3_Struct(), theEclipseLinkOrmPackage.getXmlStruct(), null, "struct", null, 0, 1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntity_2_3EClass, XmlEntity_2_3.class, "XmlEntity_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntity_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_3_NamedStoredFunctionQueries(), theEclipseLinkOrmPackage.getXmlNamedStoredFunctionQuery(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries(), theEclipseLinkOrmPackage.getXmlNamedPlsqlStoredFunctionQuery(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries(), theEclipseLinkOrmPackage.getXmlNamedPlsqlStoredProcedureQuery(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_3_PlsqlRecords(), theEclipseLinkOrmPackage.getXmlPlsqlRecord(), null, "plsqlRecords", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_2_3_Struct(), this.getXmlStruct_2_3(), null, "struct", null, 0, 1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntityMappings_2_3EClass, XmlEntityMappings_2_3.class, "XmlEntityMappings_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntityMappings_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntityMappings_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_3_TenantDiscriminatorColumns(), theEclipseLinkOrmPackage.getXmlTenantDiscriminatorColumn(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_3_NamedStoredFunctionQueries(), theEclipseLinkOrmPackage.getXmlNamedStoredFunctionQuery(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries(), theEclipseLinkOrmPackage.getXmlNamedPlsqlStoredFunctionQuery(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries(), theEclipseLinkOrmPackage.getXmlNamedPlsqlStoredProcedureQuery(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntityMappings_2_3_PlsqlRecords(), theEclipseLinkOrmPackage.getXmlPlsqlRecord(), null, "plsqlRecords", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntityMappings_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMappedSuperclass_2_3EClass, XmlMappedSuperclass_2_3.class, "XmlMappedSuperclass_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlMappedSuperclass_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries(), theEclipseLinkOrmPackage.getXmlNamedStoredFunctionQuery(), null, "namedStoredFunctionQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries(), theEclipseLinkOrmPackage.getXmlNamedPlsqlStoredFunctionQuery(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries(), theEclipseLinkOrmPackage.getXmlNamedPlsqlStoredProcedureQuery(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_3_PlsqlRecords(), theEclipseLinkOrmPackage.getXmlPlsqlRecord(), null, "plsqlRecords", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlMappedSuperclass_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMultitenant_2_3EClass, XmlMultitenant_2_3.class, "XmlMultitenant_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlMultitenant_2_3_Type(), this.getMultitenantType(), "type", null, 0, 1, XmlMultitenant_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlMultitenant_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlMultitenant_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMultitenant_2_3_TenantDiscriminatorColumns(), theEclipseLinkOrmPackage.getXmlTenantDiscriminatorColumn(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlMultitenant_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlNamedPlsqlStoredFunctionQuery_2_3EClass, XmlNamedPlsqlStoredFunctionQuery_2_3.class, "XmlNamedPlsqlStoredFunctionQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlNamedPlsqlStoredFunctionQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedPlsqlStoredFunctionQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2261,7 +2261,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl
initEAttribute(getXmlNamedStoredProcedureQuery_2_3_CallByIndex(), theXMLTypePackage.getBooleanObject(), "callByIndex", null, 0, 1, XmlNamedStoredProcedureQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlPersistenceUnitDefaults_2_3EClass, XmlPersistenceUnitDefaults_2_3.class, "XmlPersistenceUnitDefaults_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(), theEclipseLinkOrmPackage.getXmlTenantDiscriminatorColumn(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlPlsqlRecord_2_3EClass, XmlPlsqlRecord_2_3.class, "XmlPlsqlRecord_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlPlsqlRecord_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPlsqlRecord_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
index 0f09d75..16420bf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure;
/**
* <!-- begin-user-doc -->
@@ -34,7 +36,7 @@ public interface XmlAttributes_2_3 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Structures</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Structures</em>' containment reference list isn't clear,
@@ -46,11 +48,11 @@ public interface XmlAttributes_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlStructure_2_3> getStructures();
+ EList<XmlStructure> getStructures();
/**
* Returns the value of the '<em><b>Arrays</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Arrays</em>' containment reference list isn't clear,
@@ -62,6 +64,6 @@ public interface XmlAttributes_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlArray_2_3> getArrays();
+ EList<XmlArray> getArrays();
} // XmlAttributes_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
index 3e38e7b..2eb903a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,7 +11,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct;
/**
* <!-- begin-user-doc -->
@@ -36,7 +38,7 @@ public interface XmlEmbeddable_2_3 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -48,7 +50,7 @@ public interface XmlEmbeddable_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
+ EList<XmlPlsqlRecord> getPlsqlRecords();
/**
* Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
@@ -75,12 +77,12 @@ public interface XmlEmbeddable_2_3 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Struct</em>' containment reference.
- * @see #setStruct(XmlStruct_2_3)
+ * @see #setStruct(XmlStruct)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3_Struct()
* @model containment="true"
* @generated
*/
- XmlStruct_2_3 getStruct();
+ XmlStruct getStruct();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getStruct <em>Struct</em>}' containment reference.
@@ -90,6 +92,6 @@ public interface XmlEmbeddable_2_3 extends EBaseObject
* @see #getStruct()
* @generated
*/
- void setStruct(XmlStruct_2_3 value);
+ void setStruct(XmlStruct value);
} // XmlEmbeddable_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
index 68c1a86..3832e43 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,7 +11,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
/**
* <!-- begin-user-doc -->
@@ -39,7 +44,7 @@ public interface XmlEntityMappings_2_3 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
@@ -51,11 +56,11 @@ public interface XmlEntityMappings_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
+ EList<XmlTenantDiscriminatorColumn> getTenantDiscriminatorColumns();
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
@@ -67,11 +72,11 @@ public interface XmlEntityMappings_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries();
+ EList<XmlNamedStoredFunctionQuery> getNamedStoredFunctionQueries();
/**
* Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
@@ -83,11 +88,11 @@ public interface XmlEntityMappings_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries();
+ EList<XmlNamedPlsqlStoredFunctionQuery> getNamedPlsqlStoredFunctionQueries();
/**
* Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
@@ -99,11 +104,11 @@ public interface XmlEntityMappings_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries();
+ EList<XmlNamedPlsqlStoredProcedureQuery> getNamedPlsqlStoredProcedureQueries();
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -115,7 +120,7 @@ public interface XmlEntityMappings_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
+ EList<XmlPlsqlRecord> getPlsqlRecords();
/**
* Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java
index dd27d91..ead45b7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenantHolder;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
/**
@@ -38,7 +42,7 @@ public interface XmlEntity_2_3 extends XmlMultitenantHolder
{
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
@@ -50,11 +54,11 @@ public interface XmlEntity_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries();
+ EList<XmlNamedStoredFunctionQuery> getNamedStoredFunctionQueries();
/**
* Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
@@ -66,11 +70,11 @@ public interface XmlEntity_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries();
+ EList<XmlNamedPlsqlStoredFunctionQuery> getNamedPlsqlStoredFunctionQueries();
/**
* Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
@@ -82,11 +86,11 @@ public interface XmlEntity_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries();
+ EList<XmlNamedPlsqlStoredProcedureQuery> getNamedPlsqlStoredProcedureQueries();
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -98,7 +102,7 @@ public interface XmlEntity_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
+ EList<XmlPlsqlRecord> getPlsqlRecords();
/**
* Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java
index 2868c3f..3702e2c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenantHolder;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
/**
@@ -37,7 +41,7 @@ public interface XmlMappedSuperclass_2_3 extends XmlMultitenantHolder
{
/**
* Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
@@ -49,11 +53,11 @@ public interface XmlMappedSuperclass_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries();
+ EList<XmlNamedStoredFunctionQuery> getNamedStoredFunctionQueries();
/**
* Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
@@ -65,11 +69,11 @@ public interface XmlMappedSuperclass_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries();
+ EList<XmlNamedPlsqlStoredFunctionQuery> getNamedPlsqlStoredFunctionQueries();
/**
* Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
@@ -81,11 +85,11 @@ public interface XmlMappedSuperclass_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries();
+ EList<XmlNamedPlsqlStoredProcedureQuery> getNamedPlsqlStoredProcedureQueries();
/**
* Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Plsql Records</em>' containment reference list isn't clear,
@@ -97,7 +101,7 @@ public interface XmlMappedSuperclass_2_3 extends XmlMultitenantHolder
* @model containment="true"
* @generated
*/
- EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
+ EList<XmlPlsqlRecord> getPlsqlRecords();
/**
* Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
index ca297b7..d9fd0f5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4;
/**
* <!-- begin-user-doc -->
@@ -64,7 +66,7 @@ public interface XmlMultitenant_2_3 extends EBaseObject
/**
* Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
@@ -76,5 +78,5 @@ public interface XmlMultitenant_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
+ EList<XmlTenantDiscriminatorColumn> getTenantDiscriminatorColumns();
} // XmlMultitenant_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
index a133f3e..611eda2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
/**
* <!-- begin-user-doc -->
@@ -33,7 +34,7 @@ public interface XmlPersistenceUnitDefaults_2_3 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
@@ -45,6 +46,6 @@ public interface XmlPersistenceUnitDefaults_2_3 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
+ EList<XmlTenantDiscriminatorColumn> getTenantDiscriminatorColumns();
} // XmlPersistenceUnitDefaults_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
index a0f3e1a..f0d6b2d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
@@ -2088,6 +2088,7 @@ public class EclipseLinkOrmV2_4Package extends EPackageImpl
setNsURI(eNS_URI);
// Obtain other dependent packages
+ EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
@@ -2105,8 +2106,8 @@ public class EclipseLinkOrmV2_4Package extends EPackageImpl
// Initialize classes and features; add operations and parameters
initEClass(xmlBasic_2_4EClass, XmlBasic_2_4.class, "XmlBasic_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlBasic_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlBasic_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlBasic_2_4_Field(), theEclipseLinkOrmPackage.getXmlField(), null, "field", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlBasic_2_4_CacheIndex(), theEclipseLinkOrmPackage.getXmlCacheIndex(), null, "cacheIndex", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlCache_2_4EClass, XmlCache_2_4.class, "XmlCache_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlCache_2_4_DatabaseChangeNotificationType(), this.getDatabaseChangeNotificationType(), "databaseChangeNotificationType", "", 0, 1, XmlCache_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2115,21 +2116,21 @@ public class EclipseLinkOrmV2_4Package extends EPackageImpl
initEAttribute(getXmlCacheIndex_2_4_ColumnNames(), theXMLTypePackage.getString(), "columnNames", null, 0, -1, XmlCacheIndex_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlGeneratorContainer2_4EClass, XmlGeneratorContainer2_4.class, "XmlGeneratorContainer2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlGeneratorContainer2_4_UuidGenerator(), this.getXmlUuidGenerator_2_4(), null, "uuidGenerator", null, 0, 1, XmlGeneratorContainer2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlGeneratorContainer2_4_UuidGenerator(), theEclipseLinkOrmPackage.getXmlUuidGenerator(), null, "uuidGenerator", null, 0, 1, XmlGeneratorContainer2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlElementCollection_2_4EClass, XmlElementCollection_2_4.class, "XmlElementCollection_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlElementCollection_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlElementCollection_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlElementCollection_2_4_Field(), theEclipseLinkOrmPackage.getXmlField(), null, "field", null, 0, 1, XmlElementCollection_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlElementCollection_2_4_DeleteAll(), theXMLTypePackage.getBoolean(), "deleteAll", null, 0, 1, XmlElementCollection_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEmbeddable_2_4EClass, XmlEmbeddable_2_4.class, "XmlEmbeddable_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEmbeddable_2_4_NoSql(), this.getXmlNoSql_2_4(), null, "noSql", null, 0, 1, XmlEmbeddable_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEmbeddable_2_4_NoSql(), theEclipseLinkOrmPackage.getXmlNoSql(), null, "noSql", null, 0, 1, XmlEmbeddable_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEmbedded_2_4EClass, XmlEmbedded_2_4.class, "XmlEmbedded_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEmbedded_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlEmbedded_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEmbedded_2_4_Field(), theEclipseLinkOrmPackage.getXmlField(), null, "field", null, 0, 1, XmlEmbedded_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntity_2_4EClass, XmlEntity_2_4.class, "XmlEntity_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntity_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_4_NoSql(), this.getXmlNoSql_2_4(), null, "noSql", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_4_CacheIndex(), theEclipseLinkOrmPackage.getXmlCacheIndex(), null, "cacheIndex", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_4_NoSql(), theEclipseLinkOrmPackage.getXmlNoSql(), null, "noSql", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntityMappings_2_4EClass, XmlEntityMappings_2_4.class, "XmlEntityMappings_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlEntityMappings_2_4_UuidGenerators(), this.getXmlUuidGenerator_2_4(), null, "uuidGenerators", null, 0, -1, XmlEntityMappings_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2138,36 +2139,36 @@ public class EclipseLinkOrmV2_4Package extends EPackageImpl
initEAttribute(getXmlField_2_4_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlField_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlId_2_4EClass, XmlId_2_4.class, "XmlId_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlId_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlId_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlId_2_4_Field(), theEclipseLinkOrmPackage.getXmlField(), null, "field", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlId_2_4_CacheIndex(), theEclipseLinkOrmPackage.getXmlCacheIndex(), null, "cacheIndex", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlJoinField_2_4EClass, XmlJoinField_2_4.class, "XmlJoinField_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlJoinField_2_4_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlJoinField_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlJoinField_2_4_ReferencedFieldName(), theXMLTypePackage.getString(), "referencedFieldName", null, 0, 1, XmlJoinField_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlManyToMany_2_4EClass, XmlManyToMany_2_4.class, "XmlManyToMany_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlManyToMany_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlManyToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlManyToMany_2_4_JoinFields(), theEclipseLinkOrmPackage.getXmlJoinField(), null, "joinFields", null, 0, -1, XmlManyToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlManyToOne_2_4EClass, XmlManyToOne_2_4.class, "XmlManyToOne_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlManyToOne_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlManyToOne_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlManyToOne_2_4_JoinFields(), theEclipseLinkOrmPackage.getXmlJoinField(), null, "joinFields", null, 0, -1, XmlManyToOne_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMappedSuperclass_2_4EClass, XmlMappedSuperclass_2_4.class, "XmlMappedSuperclass_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlMappedSuperclass_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlMappedSuperclass_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMappedSuperclass_2_4_CacheIndex(), theEclipseLinkOrmPackage.getXmlCacheIndex(), null, "cacheIndex", null, 0, 1, XmlMappedSuperclass_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlMultitenant_2_4EClass, XmlMultitenant_2_4.class, "XmlMultitenant_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlMultitenant_2_4_IncludeCriteria(), theXMLTypePackage.getBooleanObject(), "includeCriteria", null, 0, 1, XmlMultitenant_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlMultitenant_2_4_TenantTableDiscriminator(), this.getXmlTenantTableDiscriminator_2_4(), null, "tenantTableDiscriminator", null, 0, 1, XmlMultitenant_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlMultitenant_2_4_TenantTableDiscriminator(), theEclipseLinkOrmPackage.getXmlTenantTableDiscriminator(), null, "tenantTableDiscriminator", null, 0, 1, XmlMultitenant_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlNoSql_2_4EClass, XmlNoSql_2_4.class, "XmlNoSql_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlNoSql_2_4_DataType(), theXMLTypePackage.getString(), "dataType", null, 0, 1, XmlNoSql_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNoSql_2_4_DataFormat(), this.getDataFormatType(), "dataFormat", "", 0, 1, XmlNoSql_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlOneToMany_2_4EClass, XmlOneToMany_2_4.class, "XmlOneToMany_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlOneToMany_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlOneToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToMany_2_4_JoinFields(), theEclipseLinkOrmPackage.getXmlJoinField(), null, "joinFields", null, 0, -1, XmlOneToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlOneToMany_2_4_DeleteAll(), theXMLTypePackage.getBoolean(), "deleteAll", null, 0, 1, XmlOneToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlOneToOne_2_4EClass, XmlOneToOne_2_4.class, "XmlOneToOne_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlOneToOne_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlOneToOne_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToOne_2_4_JoinFields(), theEclipseLinkOrmPackage.getXmlJoinField(), null, "joinFields", null, 0, -1, XmlOneToOne_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlTenantTableDiscriminator_2_4EClass, XmlTenantTableDiscriminator_2_4.class, "XmlTenantTableDiscriminator_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlTenantTableDiscriminator_2_4_ContextProperty(), theXMLTypePackage.getString(), "contextProperty", null, 0, 1, XmlTenantTableDiscriminator_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java
index c02ce41..690df8c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,6 +9,9 @@
*******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField;
+
/**
* <!-- begin-user-doc -->
@@ -38,12 +41,12 @@ public interface XmlBasic_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4_Field()
* @model containment="true"
* @generated
*/
- XmlField_2_4 getField();
+ XmlField getField();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getField <em>Field</em>}' containment reference.
@@ -53,7 +56,7 @@ public interface XmlBasic_2_4 extends XmlGeneratorContainer2_4
* @see #getField()
* @generated
*/
- void setField(XmlField_2_4 value);
+ void setField(XmlField value);
/**
* Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
@@ -64,12 +67,12 @@ public interface XmlBasic_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- XmlCacheIndex_2_4 getCacheIndex();
+ XmlCacheIndex getCacheIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
@@ -79,6 +82,6 @@ public interface XmlBasic_2_4 extends XmlGeneratorContainer2_4
* @see #getCacheIndex()
* @generated
*/
- void setCacheIndex(XmlCacheIndex_2_4 value);
+ void setCacheIndex(XmlCacheIndex value);
} // XmlBasic_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
index 31ea975..4d4856e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField;
/**
* <!-- begin-user-doc -->
@@ -40,12 +41,12 @@ public interface XmlElementCollection_2_4 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4_Field()
* @model containment="true"
* @generated
*/
- XmlField_2_4 getField();
+ XmlField getField();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#getField <em>Field</em>}' containment reference.
@@ -55,7 +56,7 @@ public interface XmlElementCollection_2_4 extends EBaseObject
* @see #getField()
* @generated
*/
- void setField(XmlField_2_4 value);
+ void setField(XmlField value);
/**
* Returns the value of the '<em><b>Delete All</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java
index a3b47b4..b12a700 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlEmbeddable_2_4 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>No Sql</em>' containment reference.
- * @see #setNoSql(XmlNoSql_2_4)
+ * @see #setNoSql(XmlNoSql)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbeddable_2_4_NoSql()
* @model containment="true"
* @generated
*/
- XmlNoSql_2_4 getNoSql();
+ XmlNoSql getNoSql();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4#getNoSql <em>No Sql</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlEmbeddable_2_4 extends EBaseObject
* @see #getNoSql()
* @generated
*/
- void setNoSql(XmlNoSql_2_4 value);
+ void setNoSql(XmlNoSql value);
} // XmlEmbeddable_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java
index 6013ce4..b356b4e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlEmbedded_2_4 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbedded_2_4_Field()
* @model containment="true"
* @generated
*/
- XmlField_2_4 getField();
+ XmlField getField();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4#getField <em>Field</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlEmbedded_2_4 extends EBaseObject
* @see #getField()
* @generated
*/
- void setField(XmlField_2_4 value);
+ void setField(XmlField value);
} // XmlEmbedded_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java
index f0bc085..08b7830 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,6 +9,9 @@
*******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Entity 24</b></em>'.
@@ -37,12 +40,12 @@ public interface XmlEntity_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- XmlCacheIndex_2_4 getCacheIndex();
+ XmlCacheIndex getCacheIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
@@ -52,7 +55,7 @@ public interface XmlEntity_2_4 extends XmlGeneratorContainer2_4
* @see #getCacheIndex()
* @generated
*/
- void setCacheIndex(XmlCacheIndex_2_4 value);
+ void setCacheIndex(XmlCacheIndex value);
/**
* Returns the value of the '<em><b>No Sql</b></em>' containment reference.
@@ -63,12 +66,12 @@ public interface XmlEntity_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>No Sql</em>' containment reference.
- * @see #setNoSql(XmlNoSql_2_4)
+ * @see #setNoSql(XmlNoSql)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4_NoSql()
* @model containment="true"
* @generated
*/
- XmlNoSql_2_4 getNoSql();
+ XmlNoSql getNoSql();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getNoSql <em>No Sql</em>}' containment reference.
@@ -78,6 +81,6 @@ public interface XmlEntity_2_4 extends XmlGeneratorContainer2_4
* @see #getNoSql()
* @generated
*/
- void setNoSql(XmlNoSql_2_4 value);
+ void setNoSql(XmlNoSql value);
} // XmlEntity_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java
index eeb63cf..66d2d21 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator;
/**
* <!-- begin-user-doc -->
@@ -38,12 +39,12 @@ public interface XmlGeneratorContainer2_4 extends XmlGeneratorContainer
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Uuid Generator</em>' containment reference.
- * @see #setUuidGenerator(XmlUuidGenerator_2_4)
+ * @see #setUuidGenerator(XmlUuidGenerator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlGeneratorContainer2_4_UuidGenerator()
* @model containment="true"
* @generated
*/
- XmlUuidGenerator_2_4 getUuidGenerator();
+ XmlUuidGenerator getUuidGenerator();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4#getUuidGenerator <em>Uuid Generator</em>}' containment reference.
@@ -53,6 +54,6 @@ public interface XmlGeneratorContainer2_4 extends XmlGeneratorContainer
* @see #getUuidGenerator()
* @generated
*/
- void setUuidGenerator(XmlUuidGenerator_2_4 value);
+ void setUuidGenerator(XmlUuidGenerator value);
} // XmlGeneratorContainer2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java
index b69222f..06c2ac5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,6 +9,9 @@
*******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Id 24</b></em>'.
@@ -37,12 +40,12 @@ public interface XmlId_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Field</em>' containment reference.
- * @see #setField(XmlField_2_4)
+ * @see #setField(XmlField)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4_Field()
* @model containment="true"
* @generated
*/
- XmlField_2_4 getField();
+ XmlField getField();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getField <em>Field</em>}' containment reference.
@@ -52,7 +55,7 @@ public interface XmlId_2_4 extends XmlGeneratorContainer2_4
* @see #getField()
* @generated
*/
- void setField(XmlField_2_4 value);
+ void setField(XmlField value);
/**
* Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
@@ -63,12 +66,12 @@ public interface XmlId_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- XmlCacheIndex_2_4 getCacheIndex();
+ XmlCacheIndex getCacheIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
@@ -78,6 +81,6 @@ public interface XmlId_2_4 extends XmlGeneratorContainer2_4
* @see #getCacheIndex()
* @generated
*/
- void setCacheIndex(XmlCacheIndex_2_4 value);
+ void setCacheIndex(XmlCacheIndex value);
} // XmlId_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java
index ef14af2..ca5c176 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField;
/**
* <!-- begin-user-doc -->
@@ -39,7 +40,7 @@ public interface XmlManyToMany_2_4 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -51,6 +52,6 @@ public interface XmlManyToMany_2_4 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlJoinField_2_4> getJoinFields();
+ EList<XmlJoinField> getJoinFields();
} // XmlManyToMany_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java
index 0a9a5a5..bd07ec5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField;
/**
* <!-- begin-user-doc -->
@@ -39,7 +40,7 @@ public interface XmlManyToOne_2_4 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -51,6 +52,6 @@ public interface XmlManyToOne_2_4 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlJoinField_2_4> getJoinFields();
+ EList<XmlJoinField> getJoinFields();
} // XmlManyToOne_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java
index 2ebf36b..d5559ad 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,6 +9,8 @@
*******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex;
+
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Xml Mapped Superclass 24</b></em>'.
@@ -36,12 +38,12 @@ public interface XmlMappedSuperclass_2_4 extends XmlGeneratorContainer2_4
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Cache Index</em>' containment reference.
- * @see #setCacheIndex(XmlCacheIndex_2_4)
+ * @see #setCacheIndex(XmlCacheIndex)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4_CacheIndex()
* @model containment="true"
* @generated
*/
- XmlCacheIndex_2_4 getCacheIndex();
+ XmlCacheIndex getCacheIndex();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
@@ -51,6 +53,6 @@ public interface XmlMappedSuperclass_2_4 extends XmlGeneratorContainer2_4
* @see #getCacheIndex()
* @generated
*/
- void setCacheIndex(XmlCacheIndex_2_4 value);
+ void setCacheIndex(XmlCacheIndex value);
} // XmlMappedSuperclass_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
index d75c4eb..00c1308 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator;
import org.eclipse.jpt.common.core.utility.TextRange;
/**
@@ -67,12 +68,12 @@ public interface XmlMultitenant_2_4 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Tenant Table Discriminator</em>' containment reference.
- * @see #setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4)
+ * @see #setTenantTableDiscriminator(XmlTenantTableDiscriminator)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4_TenantTableDiscriminator()
* @model containment="true"
* @generated
*/
- XmlTenantTableDiscriminator_2_4 getTenantTableDiscriminator();
+ XmlTenantTableDiscriminator getTenantTableDiscriminator();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getTenantTableDiscriminator <em>Tenant Table Discriminator</em>}' containment reference.
@@ -82,7 +83,7 @@ public interface XmlMultitenant_2_4 extends EBaseObject
* @see #getTenantTableDiscriminator()
* @generated
*/
- void setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4 value);
+ void setTenantTableDiscriminator(XmlTenantTableDiscriminator value);
TextRange getIncludeCriteriaTextRange();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
index 190b9dd..19b31dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField;
/**
* <!-- begin-user-doc -->
@@ -34,7 +35,7 @@ public interface XmlOneToMany_2_4 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -46,7 +47,7 @@ public interface XmlOneToMany_2_4 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlJoinField_2_4> getJoinFields();
+ EList<XmlJoinField> getJoinFields();
/**
* Returns the value of the '<em><b>Delete All</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java
index dc2a7d9..e4c8130 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField;
/**
* <!-- begin-user-doc -->
@@ -39,7 +40,7 @@ public interface XmlOneToOne_2_4 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Join Fields</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Join Fields</em>' containment reference list isn't clear,
@@ -51,6 +52,6 @@ public interface XmlOneToOne_2_4 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlJoinField_2_4> getJoinFields();
+ EList<XmlJoinField> getJoinFields();
} // XmlOneToOne_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Package.java
index 236f191..48bd103 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/EclipseLinkOrmV2_5Package.java
@@ -311,7 +311,6 @@ public class EclipseLinkOrmV2_5Package extends EPackageImpl
// Obtain other dependent packages
OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
- OrmV2_1Package theOrmV2_1Package = (OrmV2_1Package)EPackage.Registry.INSTANCE.getEPackage(OrmV2_1Package.eNS_URI);
// Create type parameters
@@ -322,7 +321,7 @@ public class EclipseLinkOrmV2_5Package extends EPackageImpl
// Initialize classes and features; add operations and parameters
initEClass(xmlManyToOne_2_5EClass, XmlManyToOne_2_5.class, "XmlManyToOne_2_5", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlManyToOne_2_5_PrimaryKeyForeignKey(), theOrmV2_1Package.getXmlForeignKey_2_1(), null, "primaryKeyForeignKey", null, 0, 1, XmlManyToOne_2_5.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlManyToOne_2_5_PrimaryKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "primaryKeyForeignKey", null, 0, 1, XmlManyToOne_2_5.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/XmlManyToOne_2_5.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/XmlManyToOne_2_5.java
index 0342793..d6a91c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/XmlManyToOne_2_5.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_5/XmlManyToOne_2_5.java
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_5;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
import org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumnContainer;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlForeignKey_2_1;
@@ -45,12 +46,12 @@ public interface XmlManyToOne_2_5 extends XmlPrimaryKeyJoinColumnContainer
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Primary Key Foreign Key</em>' containment reference.
- * @see #setPrimaryKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setPrimaryKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_5.EclipseLinkOrmV2_5Package#getXmlManyToOne_2_5_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getPrimaryKeyForeignKey();
+ XmlForeignKey getPrimaryKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_5.XmlManyToOne_2_5#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlManyToOne_2_5 extends XmlPrimaryKeyJoinColumnContainer
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- void setPrimaryKeyForeignKey(XmlForeignKey_2_1 value);
+ void setPrimaryKeyForeignKey(XmlForeignKey value);
} // XmlManyToOne_2_5
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmTenantDiscriminatorColumn2_3.java
index 1272f56..556b590 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmTenantDiscriminatorColumn2_3.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,7 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
import org.eclipse.jpt.jpa.eclipselink.core.context.TenantDiscriminatorColumn2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
+import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
/**
* orm tenant discriminator column
@@ -27,5 +27,5 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscrimin
public interface OrmTenantDiscriminatorColumn2_3
extends TenantDiscriminatorColumn2_3
{
- XmlTenantDiscriminatorColumn_2_3 getXmlColumn();
+ XmlTenantDiscriminatorColumn getXmlColumn();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
index c572a70..15b9d7c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
@@ -45,7 +45,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -59,7 +58,7 @@ public class EclipseLinkEntityMappingsImpl
{
protected final OrmEclipseLinkConverterContainer converterContainer;
- protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> specifiedTenantDiscriminatorColumnContainer;
+ protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn> specifiedTenantDiscriminatorColumnContainer;
protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner;
protected final ContextListContainer<VirtualTenantDiscriminatorColumn2_3, ReadOnlyTenantDiscriminatorColumn2_3> defaultTenantDiscriminatorColumnContainer;
@@ -247,7 +246,7 @@ public class EclipseLinkEntityMappingsImpl
this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
}
- protected ListIterable<XmlTenantDiscriminatorColumn_2_3> getXmlTenantDiscriminatorColumns() {
+ protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
if (getXmlEntityMappings() == null) {
return EmptyListIterable.instance();
}
@@ -259,22 +258,22 @@ public class EclipseLinkEntityMappingsImpl
* specified tenant discriminator column container
*/
protected class SpecifiedTenantDiscriminatorColumnContainer
- extends ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3>
+ extends ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn>
{
@Override
protected String getContextElementsPropertyName() {
return SPECIFIED_TENANT_DISCRIMINATOR_COLUMNS_LIST;
}
@Override
- protected OrmTenantDiscriminatorColumn2_3 buildContextElement(XmlTenantDiscriminatorColumn_2_3 resourceElement) {
+ protected OrmTenantDiscriminatorColumn2_3 buildContextElement(XmlTenantDiscriminatorColumn resourceElement) {
return EclipseLinkEntityMappingsImpl.this.buildTenantDiscriminatorColumn(resourceElement);
}
@Override
- protected ListIterable<XmlTenantDiscriminatorColumn_2_3> getResourceElements() {
+ protected ListIterable<XmlTenantDiscriminatorColumn> getResourceElements() {
return EclipseLinkEntityMappingsImpl.this.getXmlTenantDiscriminatorColumns();
}
@Override
- protected XmlTenantDiscriminatorColumn_2_3 getResourceElement(OrmTenantDiscriminatorColumn2_3 contextElement) {
+ protected XmlTenantDiscriminatorColumn getResourceElement(OrmTenantDiscriminatorColumn2_3 contextElement) {
return contextElement.getXmlColumn();
}
}
@@ -289,7 +288,7 @@ public class EclipseLinkEntityMappingsImpl
return container;
}
- protected OrmTenantDiscriminatorColumn2_3 buildTenantDiscriminatorColumn(XmlTenantDiscriminatorColumn_2_3 xmlTenantDiscriminatorColumn) {
+ protected OrmTenantDiscriminatorColumn2_3 buildTenantDiscriminatorColumn(XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn) {
return new EclipseLinkOrmTenantDiscriminatorColumn2_3(this, this.tenantDiscriminatorColumnOwner, xmlTenantDiscriminatorColumn);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
index 2ce0a2d..98f19d2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
@@ -21,10 +21,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscrimin
* <code>orm.xml</code> tenant discriminator column
*/
public class EclipseLinkOrmTenantDiscriminatorColumn2_3
- extends AbstractOrmNamedDiscriminatorColumn<XmlTenantDiscriminatorColumn_2_3, ReadOnlyTenantDiscriminatorColumn2_3.Owner>
+ extends AbstractOrmNamedDiscriminatorColumn<XmlTenantDiscriminatorColumn, ReadOnlyTenantDiscriminatorColumn2_3.Owner>
implements OrmTenantDiscriminatorColumn2_3
{
- protected XmlTenantDiscriminatorColumn_2_3 xmlTenantDiscriminatorColumn;
+ protected XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn;
protected String specifiedTableName;
protected String defaultTableName;
@@ -35,7 +35,7 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3
protected Boolean specifiedPrimaryKey;
protected boolean defaultPrimaryKey = DEFAULT_PRIMARY_KEY;
- public EclipseLinkOrmTenantDiscriminatorColumn2_3(JpaContextNode parent, ReadOnlyTenantDiscriminatorColumn2_3.Owner owner, XmlTenantDiscriminatorColumn_2_3 column) {
+ public EclipseLinkOrmTenantDiscriminatorColumn2_3(JpaContextNode parent, ReadOnlyTenantDiscriminatorColumn2_3.Owner owner, XmlTenantDiscriminatorColumn column) {
super(parent, owner, column);
this.specifiedTableName = this.buildSpecifiedTableName();
this.specifiedContextProperty = this.buildSpecifiedContextProperty();
@@ -66,12 +66,12 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3
// ********** XML column **********
@Override
- public XmlTenantDiscriminatorColumn_2_3 getXmlColumn() {
+ public XmlTenantDiscriminatorColumn getXmlColumn() {
return this.xmlTenantDiscriminatorColumn;
}
@Override
- protected void setXmlColumn(XmlTenantDiscriminatorColumn_2_3 xmlColumn) {
+ protected void setXmlColumn(XmlTenantDiscriminatorColumn xmlColumn) {
this.xmlTenantDiscriminatorColumn = xmlColumn;
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
index c83c8ad..ea4ae8d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
@@ -14,7 +14,6 @@ import org.eclipse.jpt.jpa.core.context.Orderable;
import org.eclipse.jpt.jpa.core.context.Table;
import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer;
import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery;
import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.orm.OrmSequenceGenerator;
import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmAssociationOverrideContainer;
@@ -39,7 +38,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderColumn2_0;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderable2_0;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmSingleRelationshipMapping2_0;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection;
public class EclipseLinkOrmXml2_0ContextNodeFactory
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java
index 5130fb7..74eab44 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java
@@ -49,7 +49,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenantHolder;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4;
import org.eclipse.jpt.jpa.eclipselink.core.validation.JptJpaEclipseLinkCoreValidationMessages;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -68,7 +67,7 @@ public class OrmEclipseLinkMultitenancyImpl2_3
protected Boolean specifiedIncludeCriteria;
protected boolean defaultIncludeCriteria = DEFAULT_INCLUDE_CRITERIA;
- protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> specifiedTenantDiscriminatorColumnContainer;
+ protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn> specifiedTenantDiscriminatorColumnContainer;
protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner;
protected final ContextListContainer<VirtualTenantDiscriminatorColumn2_3, ReadOnlyTenantDiscriminatorColumn2_3> defaultTenantDiscriminatorColumnContainer;
@@ -338,7 +337,7 @@ public class OrmEclipseLinkMultitenancyImpl2_3
this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
}
- protected ListIterable<XmlTenantDiscriminatorColumn_2_3> getXmlTenantDiscriminatorColumns() {
+ protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
if (getXmlMultitenant() == null) {
return EmptyListIterable.instance();
}
@@ -350,22 +349,22 @@ public class OrmEclipseLinkMultitenancyImpl2_3
* specified tenant discriminator column container
*/
protected class SpecifiedTenantDiscriminatorColumnContainer
- extends ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3>
+ extends ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn>
{
@Override
protected String getContextElementsPropertyName() {
return SPECIFIED_TENANT_DISCRIMINATOR_COLUMNS_LIST;
}
@Override
- protected OrmTenantDiscriminatorColumn2_3 buildContextElement(XmlTenantDiscriminatorColumn_2_3 resourceElement) {
+ protected OrmTenantDiscriminatorColumn2_3 buildContextElement(XmlTenantDiscriminatorColumn resourceElement) {
return OrmEclipseLinkMultitenancyImpl2_3.this.buildTenantDiscriminatorColumn(resourceElement);
}
@Override
- protected ListIterable<XmlTenantDiscriminatorColumn_2_3> getResourceElements() {
+ protected ListIterable<XmlTenantDiscriminatorColumn> getResourceElements() {
return OrmEclipseLinkMultitenancyImpl2_3.this.getXmlTenantDiscriminatorColumns();
}
@Override
- protected XmlTenantDiscriminatorColumn_2_3 getResourceElement(OrmTenantDiscriminatorColumn2_3 contextElement) {
+ protected XmlTenantDiscriminatorColumn getResourceElement(OrmTenantDiscriminatorColumn2_3 contextElement) {
return contextElement.getXmlColumn();
}
}
@@ -374,13 +373,13 @@ public class OrmEclipseLinkMultitenancyImpl2_3
return new TenantDiscriminatorColumnOwner();
}
- protected ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> buildSpecifiedTenantDiscriminatorColumnContainer() {
+ protected ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn> buildSpecifiedTenantDiscriminatorColumnContainer() {
SpecifiedTenantDiscriminatorColumnContainer container = new SpecifiedTenantDiscriminatorColumnContainer();
container.initialize();
return container;
}
- protected OrmTenantDiscriminatorColumn2_3 buildTenantDiscriminatorColumn(XmlTenantDiscriminatorColumn_2_3 xmlTenantDiscriminatorColumn) {
+ protected OrmTenantDiscriminatorColumn2_3 buildTenantDiscriminatorColumn(XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn) {
return new EclipseLinkOrmTenantDiscriminatorColumn2_3(this, this.tenantDiscriminatorColumnOwner, xmlTenantDiscriminatorColumn);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java
index 766ef87..8880fa3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java
@@ -28,7 +28,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
/**
* EclipseLink <code>orm.xml</code> file
@@ -40,7 +39,7 @@ public class OrmEclipseLinkPersistenceUnitDefaults
implements EclipseLinkPersistenceUnitDefaults
{
- protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumnContainer;
+ protected final ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn> tenantDiscriminatorColumnContainer;
protected final ReadOnlyTenantDiscriminatorColumn2_3.Owner tenantDiscriminatorColumnOwner;
protected String specifiedGetMethod;
@@ -139,7 +138,7 @@ public class OrmEclipseLinkPersistenceUnitDefaults
this.tenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
}
- protected ListIterable<XmlTenantDiscriminatorColumn_2_3> getXmlTenantDiscriminatorColumns() {
+ protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
if (getXmlDefaults() == null) {
return EmptyListIterable.instance();
}
@@ -151,22 +150,22 @@ public class OrmEclipseLinkPersistenceUnitDefaults
* tenant discriminator column container
*/
protected class TenantDiscriminatorColumnContainer
- extends ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3>
+ extends ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn>
{
@Override
protected String getContextElementsPropertyName() {
return TENANT_DISCRIMINATOR_COLUMNS_LIST;
}
@Override
- protected OrmTenantDiscriminatorColumn2_3 buildContextElement(XmlTenantDiscriminatorColumn_2_3 resourceElement) {
+ protected OrmTenantDiscriminatorColumn2_3 buildContextElement(XmlTenantDiscriminatorColumn resourceElement) {
return OrmEclipseLinkPersistenceUnitDefaults.this.buildTenantDiscriminatorColumn(resourceElement);
}
@Override
- protected ListIterable<XmlTenantDiscriminatorColumn_2_3> getResourceElements() {
+ protected ListIterable<XmlTenantDiscriminatorColumn> getResourceElements() {
return OrmEclipseLinkPersistenceUnitDefaults.this.getXmlTenantDiscriminatorColumns();
}
@Override
- protected XmlTenantDiscriminatorColumn_2_3 getResourceElement(OrmTenantDiscriminatorColumn2_3 contextElement) {
+ protected XmlTenantDiscriminatorColumn getResourceElement(OrmTenantDiscriminatorColumn2_3 contextElement) {
return contextElement.getXmlColumn();
}
}
@@ -175,11 +174,11 @@ public class OrmEclipseLinkPersistenceUnitDefaults
return new TenantDiscriminatorColumnOwner();
}
- protected OrmTenantDiscriminatorColumn2_3 buildTenantDiscriminatorColumn(XmlTenantDiscriminatorColumn_2_3 xmlTenantDiscriminatorColumn) {
+ protected OrmTenantDiscriminatorColumn2_3 buildTenantDiscriminatorColumn(XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn) {
return new EclipseLinkOrmTenantDiscriminatorColumn2_3(this, this.tenantDiscriminatorColumnOwner, xmlTenantDiscriminatorColumn);
}
- protected ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn_2_3> buildTenantDiscriminatorColumnContainer() {
+ protected ContextListContainer<OrmTenantDiscriminatorColumn2_3, XmlTenantDiscriminatorColumn> buildTenantDiscriminatorColumnContainer() {
TenantDiscriminatorColumnContainer container = new TenantDiscriminatorColumnContainer();
container.initialize();
return container;