summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2013-02-18 13:53:23 (EST)
committerKaren Butzke2013-02-18 13:53:23 (EST)
commite1ba40b17bf7d4340119ecb964755a55cc2424cc (patch)
treea92a0c746f69c1ae2a7a5909c23c04b3fdc2a94d
parent084a62b3ccfbf7d3c76d2e82f6f16704ee992f45 (diff)
downloadwebtools.dali-e1ba40b17bf7d4340119ecb964755a55cc2424cc.zip
webtools.dali-e1ba40b17bf7d4340119ecb964755a55cc2424cc.tar.gz
webtools.dali-e1ba40b17bf7d4340119ecb964755a55cc2424cc.tar.bz2
updated orm.ecore to use classes instead of interfaces for 2.1 version support, this is what we did for the 2.0 support
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore76
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java52
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java36
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java32
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java30
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java56
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java42
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java42
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java129
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlAssociationOverride_2_1.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlCollectionTable_2_1.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverterContainer_2_1.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvertibleMapping_2_1.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlElementCollection_2_1.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEmbedded_2_1.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntity_2_1.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlJoinTable_2_1.java13
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToMany_2_1.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToOne_2_1.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedEntityGraph_2_1.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedSubgraph_2_1.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToMany_2_1.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToOne_2_1.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSecondaryTable_2_1.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSqlResultSetMapping_2_1.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTableGenerator_2_1.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTable_2_1.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmXml2_1ContextNodeFactory.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/OrmConverterTypeDefinition.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmConverterType2_1.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmXml2_1ContextNodeFactory.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java13
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkConverterContainerImpl.java21
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_5ContextNodeFactory.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityMappingsConverterContainer.java10
69 files changed, 625 insertions, 560 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
index 9454972..a5e122a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore
@@ -315,7 +315,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//XmlQuery #//v2_0/XmlNamedQuery_2_0">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery" eSuperTypes="#//v2_1/XmlNamedStoredProcedureQuery_2_1"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery" eSuperTypes="#//XmlQuery #//v2_1/XmlNamedStoredProcedureQuery_2_1"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlNullAttributeMapping" abstract="true"
eSuperTypes="#//AbstractXmlAttributeMapping"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" eSuperTypes="#//AbstractXmlMultiRelationshipMapping #//XmlJoinColumnContainer #//v2_0/XmlOneToMany_2_0 #//v2_1/XmlOneToMany_2_1"/>
@@ -607,19 +607,19 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1"
- eType="#//v2_1/ColumnResult_2_1" containment="true"/>
+ eType="#//ColumnResult" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride_2_1" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlCollectionTable_2_1" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
- eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlIndex" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlConvert_2_1" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -628,40 +628,40 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disableConversion" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlConverter_2_1" abstract="true"
- interface="true" eSuperTypes="#//XmlManagedType">
+ interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="autoApply" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlConverterContainer_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="converters" upperBound="-1"
- eType="#//v2_1/XmlConverter_2_1" containment="true"/>
+ eType="#//XmlConverter" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlConvertibleMapping_2_1" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="convert" eType="#//v2_1/XmlConvert_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="convert" eType="#//XmlConvert"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="converts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_1" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="converts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_1" abstract="true" interface="true"
eSuperTypes="#//v2_1/XmlQueryContainer_2_1">
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
- eType="#//v2_1/XmlForeignKey_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlForeignKey" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="converts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="namedEntityGraphs" upperBound="-1"
- eType="#//v2_1/XmlNamedEntityGraph_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlNamedEntityGraph" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_1" abstract="true"
interface="true" eSuperTypes="#//v2_1/XmlConverterContainer_2_1 #//v2_1/XmlQueryContainer_2_1"/>
@@ -682,9 +682,9 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable_2_1" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="inverseForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="inverseForeignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
@@ -692,13 +692,13 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne_2_1" abstract="true"
interface="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedAttributeNode_2_1" abstract="true"
@@ -711,19 +711,18 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedEntityGraph_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="namedAttributeNodes"
- upperBound="-1" eType="#//v2_1/XmlNamedAttributeNode_2_1" containment="true"
- resolveProxies="false"/>
+ upperBound="-1" eType="#//XmlNamedAttributeNode" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="subgraphs" upperBound="-1"
- eType="#//v2_1/XmlNamedSubgraph_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlNamedSubgraph" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="subclassSubgraphs" upperBound="-1"
- eType="#//v2_1/XmlNamedSubgraph_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlNamedSubgraph" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="includeAllAttributes"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedStoredProcedureQuery_2_1"
- abstract="true" interface="true" eSuperTypes="#//XmlQuery">
+ abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClasses" upperBound="-1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMappings" upperBound="-1"
@@ -731,13 +730,12 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="procedureName" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
- eType="#//v2_1/XmlStoredProcedureParameter_2_1" containment="true"/>
+ eType="#//XmlStoredProcedureParameter" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlNamedSubgraph_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="namedAttributeNodes"
- upperBound="-1" eType="#//v2_1/XmlNamedAttributeNode_2_1" containment="true"
- resolveProxies="false"/>
+ upperBound="-1" eType="#//XmlNamedAttributeNode" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -745,18 +743,18 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyForeignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_1" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyConverts" upperBound="-1"
- eType="#//v2_1/XmlConvert_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlConvert" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
- eType="#//v2_1/XmlForeignKey_2_1" containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//v2_1/XmlForeignKey_2_1"
+ eType="#//XmlForeignKey" containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="#//XmlForeignKey"
containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer_2_1" abstract="true"
@@ -768,9 +766,9 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyForeignKey"
- eType="#//v2_1/XmlForeignKey_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlForeignKey" containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
- eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlIndex" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlStoredProcedureParameter_2_1" abstract="true"
interface="true">
@@ -783,16 +781,16 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlSqlResultSetMapping_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="constructorResults" upperBound="-1"
- eType="#//v2_1/ConstructorResult_2_1" containment="true" resolveProxies="false"/>
+ eType="#//ConstructorResult" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlTable_2_1" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
- eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlIndex" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="indexes" upperBound="-1"
- eType="#//v2_1/XmlIndex_2_1" containment="true" resolveProxies="false"/>
+ eType="#//XmlIndex" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="ParameterMode_2_1">
<eLiterals name="IN"/>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
index 885237e..8d34876 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/ConstructorResult.java
@@ -79,7 +79,7 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
* @generated
* @ordered
*/
- protected EList<ColumnResult_2_1> columnResults;
+ protected EList<ColumnResult> columnResults;
/**
* <!-- begin-user-doc -->
@@ -139,7 +139,7 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
/**
* Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.ColumnResult}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Column Results</em>' reference list isn't clear,
@@ -151,11 +151,11 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
* @model containment="true"
* @generated
*/
- public EList<ColumnResult_2_1> getColumnResults()
+ public EList<ColumnResult> getColumnResults()
{
if (columnResults == null)
{
- columnResults = new EObjectContainmentEList<ColumnResult_2_1>(ColumnResult_2_1.class, this, OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS);
+ columnResults = new EObjectContainmentEList<ColumnResult>(ColumnResult.class, this, OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS);
}
return columnResults;
}
@@ -210,7 +210,7 @@ public class ConstructorResult extends EBaseObjectImpl implements ConstructorRes
return;
case OrmPackage.CONSTRUCTOR_RESULT__COLUMN_RESULTS:
getColumnResults().clear();
- getColumnResults().addAll((Collection<? extends ColumnResult_2_1>)newValue);
+ getColumnResults().addAll((Collection<? extends ColumnResult>)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
index 1820bee..e6e6677 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java
@@ -3556,6 +3556,15 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ENTITY_MAPPINGS__VERSION = CommonPackage.EROOT_OBJECT_IMPL__VERSION;
/**
+ * The feature id for the '<em><b>Namespace</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_MAPPINGS__NAMESPACE = CommonPackage.EROOT_OBJECT_IMPL__NAMESPACE;
+
+ /**
* The feature id for the '<em><b>Schema Location</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5147,7 +5156,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__DESCRIPTION;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = XML_QUERY__DESCRIPTION;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -5156,7 +5165,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__NAME;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = XML_QUERY__NAME;
/**
* The feature id for the '<em><b>Hints</b></em>' containment reference list.
@@ -5165,7 +5174,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__HINTS;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = XML_QUERY__HINTS;
/**
* The feature id for the '<em><b>Result Classes</b></em>' attribute list.
@@ -5174,7 +5183,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = XML_QUERY_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Result Set Mappings</b></em>' attribute list.
@@ -5183,7 +5192,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = XML_QUERY_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Procedure Name</b></em>' attribute.
@@ -5192,7 +5201,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = XML_QUERY_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -5201,7 +5210,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = XML_QUERY_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>Xml Named Stored Procedure Query</em>' class.
@@ -5210,7 +5219,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT + 0;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 4;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
@@ -11715,6 +11724,7 @@ public class OrmPackage extends EPackageImpl
xmlNamedNativeQueryEClass.getESuperTypes().add(this.getXmlQuery());
xmlNamedQueryEClass.getESuperTypes().add(this.getXmlQuery());
xmlNamedQueryEClass.getESuperTypes().add(theOrmV2_0Package.getXmlNamedQuery_2_0());
+ xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(this.getXmlQuery());
xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedStoredProcedureQuery_2_1());
xmlNullAttributeMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlOneToManyEClass.getESuperTypes().add(this.getAbstractXmlMultiRelationshipMapping());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
index 37787c7..af8fcbd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlAssociationOverride.java
@@ -116,7 +116,7 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 foreignKey;
+ protected XmlForeignKey foreignKey;
/**
* <!-- begin-user-doc -->
@@ -206,12 +206,12 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverride_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getForeignKey()
+ public XmlForeignKey getForeignKey()
{
return foreignKey;
}
@@ -221,9 +221,9 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetForeignKey(XmlForeignKey newForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ XmlForeignKey oldForeignKey = foreignKey;
foreignKey = newForeignKey;
if (eNotificationRequired())
{
@@ -241,7 +241,7 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
* @see #getForeignKey()
* @generated
*/
- public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ public void setForeignKey(XmlForeignKey newForeignKey)
{
if (newForeignKey != foreignKey)
{
@@ -421,7 +421,7 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
setDescription((String)newValue);
return;
case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)newValue);
+ setForeignKey((XmlForeignKey)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -450,7 +450,7 @@ public class XmlAssociationOverride extends EBaseObjectImpl implements XmlOverri
setDescription(DESCRIPTION_EDEFAULT);
return;
case OrmPackage.XML_ASSOCIATION_OVERRIDE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)null);
+ setForeignKey((XmlForeignKey)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java
index 6601516..1c3d5cf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlBasic.java
@@ -69,7 +69,7 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
* @generated
* @ordered
*/
- protected XmlConvert_2_1 convert;
+ protected XmlConvert convert;
/**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
@@ -360,12 +360,12 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Convert</em>' containment reference.
- * @see #setConvert(XmlConvert_2_1)
+ * @see #setConvert(XmlConvert)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
* @model containment="true"
* @generated
*/
- public XmlConvert_2_1 getConvert()
+ public XmlConvert getConvert()
{
return convert;
}
@@ -375,9 +375,9 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ public NotificationChain basicSetConvert(XmlConvert newConvert, NotificationChain msgs)
{
- XmlConvert_2_1 oldConvert = convert;
+ XmlConvert oldConvert = convert;
convert = newConvert;
if (eNotificationRequired())
{
@@ -395,7 +395,7 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
* @see #getConvert()
* @generated
*/
- public void setConvert(XmlConvert_2_1 newConvert)
+ public void setConvert(XmlConvert newConvert)
{
if (newConvert != convert)
{
@@ -545,7 +545,7 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
setColumn((XmlColumn)newValue);
return;
case OrmPackage.XML_BASIC__CONVERT:
- setConvert((XmlConvert_2_1)newValue);
+ setConvert((XmlConvert)newValue);
return;
case OrmPackage.XML_BASIC__LOB:
setLob((Boolean)newValue);
@@ -580,7 +580,7 @@ public class XmlBasic extends AbstractXmlAttributeMapping implements ColumnMappi
setColumn((XmlColumn)null);
return;
case OrmPackage.XML_BASIC__CONVERT:
- setConvert((XmlConvert_2_1)null);
+ setConvert((XmlConvert)null);
return;
case OrmPackage.XML_BASIC__LOB:
setLob(LOB_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java
index 6a6acb3..b8db31e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlCollectionTable.java
@@ -50,7 +50,7 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 foreignKey;
+ protected XmlForeignKey foreignKey;
/**
* The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -59,7 +59,7 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
* @generated
* @ordered
*/
- protected EList<XmlIndex_2_1> indexes;
+ protected EList<XmlIndex> indexes;
/**
* <!-- begin-user-doc -->
@@ -91,12 +91,12 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlCollectionTable_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getForeignKey()
+ public XmlForeignKey getForeignKey()
{
return foreignKey;
}
@@ -106,9 +106,9 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetForeignKey(XmlForeignKey newForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ XmlForeignKey oldForeignKey = foreignKey;
foreignKey = newForeignKey;
if (eNotificationRequired())
{
@@ -126,7 +126,7 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
* @see #getForeignKey()
* @generated
*/
- public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ public void setForeignKey(XmlForeignKey newForeignKey)
{
if (newForeignKey != foreignKey)
{
@@ -144,7 +144,7 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -156,11 +156,11 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
* @model containment="true"
* @generated
*/
- public EList<XmlIndex_2_1> getIndexes()
+ public EList<XmlIndex> getIndexes()
{
if (indexes == null)
{
- indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_COLLECTION_TABLE__INDEXES);
+ indexes = new EObjectContainmentEList<XmlIndex>(XmlIndex.class, this, OrmPackage.XML_COLLECTION_TABLE__INDEXES);
}
return indexes;
}
@@ -213,11 +213,11 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
switch (featureID)
{
case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)newValue);
+ setForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
getIndexes().clear();
- getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ getIndexes().addAll((Collection<? extends XmlIndex>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -234,7 +234,7 @@ public class XmlCollectionTable extends AbstractXmlReferenceTable implements Xml
switch (featureID)
{
case OrmPackage.XML_COLLECTION_TABLE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)null);
+ setForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_COLLECTION_TABLE__INDEXES:
getIndexes().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
index 6dd3a11..3943716 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java
@@ -239,8 +239,8 @@ public class XmlConverter extends AbstractXmlManagedType implements XmlConverter
}
- public Class<? extends XmlConverter_2_1> getType() {
- return XmlConverter_2_1.class;
+ public Class<? extends XmlConverter> getType() {
+ return XmlConverter.class;
}
// ********** translators **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java
index 5954de1..f8cf350 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlElementCollection.java
@@ -61,7 +61,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlConvert_2_1 convert;
+ protected XmlConvert convert;
/**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
@@ -311,7 +311,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> mapKeyConverts;
+ protected EList<XmlConvert> mapKeyConverts;
/**
* The cached value of the '{@link #getMapKeyForeignKey() <em>Map Key Foreign Key</em>}' containment reference.
@@ -321,7 +321,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 mapKeyForeignKey;
+ protected XmlForeignKey mapKeyForeignKey;
/**
* The cached value of the '{@link #getConverts() <em>Converts</em>}' containment reference list.
@@ -331,7 +331,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> converts;
+ protected EList<XmlConvert> converts;
/**
* <!-- begin-user-doc -->
@@ -363,12 +363,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Convert</em>' containment reference.
- * @see #setConvert(XmlConvert_2_1)
+ * @see #setConvert(XmlConvert)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
* @model containment="true"
* @generated
*/
- public XmlConvert_2_1 getConvert()
+ public XmlConvert getConvert()
{
return convert;
}
@@ -378,9 +378,9 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ public NotificationChain basicSetConvert(XmlConvert newConvert, NotificationChain msgs)
{
- XmlConvert_2_1 oldConvert = convert;
+ XmlConvert oldConvert = convert;
convert = newConvert;
if (eNotificationRequired())
{
@@ -398,7 +398,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @see #getConvert()
* @generated
*/
- public void setConvert(XmlConvert_2_1 newConvert)
+ public void setConvert(XmlConvert newConvert)
{
if (newConvert != convert)
{
@@ -1163,7 +1163,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -1175,11 +1175,11 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getMapKeyConverts()
+ public EList<XmlConvert> getMapKeyConverts()
{
if (mapKeyConverts == null)
{
- mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS);
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS);
}
return mapKeyConverts;
}
@@ -1193,12 +1193,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
- * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setMapKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection_2_1_MapKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getMapKeyForeignKey()
+ public XmlForeignKey getMapKeyForeignKey()
{
return mapKeyForeignKey;
}
@@ -1208,9 +1208,9 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey newMapKeyForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldMapKeyForeignKey = mapKeyForeignKey;
+ XmlForeignKey oldMapKeyForeignKey = mapKeyForeignKey;
mapKeyForeignKey = newMapKeyForeignKey;
if (eNotificationRequired())
{
@@ -1228,7 +1228,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @see #getMapKeyForeignKey()
* @generated
*/
- public void setMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey)
+ public void setMapKeyForeignKey(XmlForeignKey newMapKeyForeignKey)
{
if (newMapKeyForeignKey != mapKeyForeignKey)
{
@@ -1246,7 +1246,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
/**
* Returns the value of the '<em><b>Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converts</em>' containment reference list isn't clear,
@@ -1258,11 +1258,11 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getConverts()
+ public EList<XmlConvert> getConverts()
{
if (converts == null)
{
- converts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS);
+ converts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS);
}
return converts;
}
@@ -1379,7 +1379,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
switch (featureID)
{
case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
- setConvert((XmlConvert_2_1)newValue);
+ setConvert((XmlConvert)newValue);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__LOB:
setLob((Boolean)newValue);
@@ -1441,14 +1441,14 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERTS:
getMapKeyConverts().clear();
- getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
- setMapKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setMapKeyForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
getConverts().clear();
- getConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -1465,7 +1465,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
switch (featureID)
{
case OrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
- setConvert((XmlConvert_2_1)null);
+ setConvert((XmlConvert)null);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__LOB:
setLob(LOB_EDEFAULT);
@@ -1525,7 +1525,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
getMapKeyConverts().clear();
return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_FOREIGN_KEY:
- setMapKeyForeignKey((XmlForeignKey_2_1)null);
+ setMapKeyForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__CONVERTS:
getConverts().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java
index 5d28dd5..cc19738 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEmbedded.java
@@ -62,7 +62,7 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0,
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> converts;
+ protected EList<XmlConvert> converts;
/**
* <!-- begin-user-doc -->
@@ -110,7 +110,7 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0,
/**
* Returns the value of the '<em><b>Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converts</em>' containment reference list isn't clear,
@@ -122,11 +122,11 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0,
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getConverts()
+ public EList<XmlConvert> getConverts()
{
if (converts == null)
{
- converts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_EMBEDDED__CONVERTS);
+ converts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_EMBEDDED__CONVERTS);
}
return converts;
}
@@ -184,7 +184,7 @@ public class XmlEmbedded extends AbstractXmlEmbedded implements XmlEmbedded_2_0,
return;
case OrmPackage.XML_EMBEDDED__CONVERTS:
getConverts().clear();
- getConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java
index 1a418d3..468ee8a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntity.java
@@ -250,7 +250,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 primaryKeyForeignKey;
+ protected XmlForeignKey primaryKeyForeignKey;
/**
* The cached value of the '{@link #getConverts() <em>Converts</em>}' containment reference list.
@@ -260,7 +260,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> converts;
+ protected EList<XmlConvert> converts;
/**
* The cached value of the '{@link #getNamedEntityGraphs() <em>Named Entity Graphs</em>}' containment reference list.
@@ -270,7 +270,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @generated
* @ordered
*/
- protected EList<XmlNamedEntityGraph_2_1> namedEntityGraphs;
+ protected EList<XmlNamedEntityGraph> namedEntityGraphs;
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -684,12 +684,12 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* </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.core.resource.orm.OrmPackage#getXmlEntity_2_1_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ public XmlForeignKey getPrimaryKeyForeignKey()
{
return primaryKeyForeignKey;
}
@@ -699,9 +699,9 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* <!-- 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())
{
@@ -719,7 +719,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ public void setPrimaryKeyForeignKey(XmlForeignKey newPrimaryKeyForeignKey)
{
if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
{
@@ -737,7 +737,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
/**
* Returns the value of the '<em><b>Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converts</em>' containment reference list isn't clear,
@@ -749,18 +749,18 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getConverts()
+ public EList<XmlConvert> getConverts()
{
if (converts == null)
{
- converts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ENTITY__CONVERTS);
+ converts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_ENTITY__CONVERTS);
}
return converts;
}
/**
* Returns the value of the '<em><b>Named Entity Graphs</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedEntityGraph_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Entity Graphs</em>' containment reference list isn't clear,
@@ -772,11 +772,11 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @model containment="true"
* @generated
*/
- public EList<XmlNamedEntityGraph_2_1> getNamedEntityGraphs()
+ public EList<XmlNamedEntityGraph> getNamedEntityGraphs()
{
if (namedEntityGraphs == null)
{
- namedEntityGraphs = new EObjectContainmentEList<XmlNamedEntityGraph_2_1>(XmlNamedEntityGraph_2_1.class, this, OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS);
+ namedEntityGraphs = new EObjectContainmentEList<XmlNamedEntityGraph>(XmlNamedEntityGraph.class, this, OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS);
}
return namedEntityGraphs;
}
@@ -1959,15 +1959,15 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
setIdClass((XmlClassReference)newValue);
return;
case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setPrimaryKeyForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_ENTITY__CONVERTS:
getConverts().clear();
- getConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
case OrmPackage.XML_ENTITY__NAMED_ENTITY_GRAPHS:
getNamedEntityGraphs().clear();
- getNamedEntityGraphs().addAll((Collection<? extends XmlNamedEntityGraph_2_1>)newValue);
+ getNamedEntityGraphs().addAll((Collection<? extends XmlNamedEntityGraph>)newValue);
return;
case OrmPackage.XML_ENTITY__NAME:
setName((String)newValue);
@@ -2068,7 +2068,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
setIdClass((XmlClassReference)null);
return;
case OrmPackage.XML_ENTITY__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ setPrimaryKeyForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_ENTITY__CONVERTS:
getConverts().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
index a7fa77c..1138565 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
@@ -28,6 +28,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlEntityMappings_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlQueryContainer_2_1;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin;
@@ -128,7 +129,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
@@ -607,7 +608,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' reference list isn't clear,
@@ -619,11 +620,11 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, OrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, OrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS);
}
return converters;
}
@@ -876,7 +877,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
return;
case OrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION:
setDescription((String)newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java
index aa408d3..7324f92 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlId.java
@@ -64,7 +64,7 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
* @generated
* @ordered
*/
- protected XmlConvert_2_1 convert;
+ protected XmlConvert convert;
/**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
* <!-- begin-user-doc -->
@@ -230,12 +230,12 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Convert</em>' containment reference.
- * @see #setConvert(XmlConvert_2_1)
+ * @see #setConvert(XmlConvert)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
* @model containment="true"
* @generated
*/
- public XmlConvert_2_1 getConvert()
+ public XmlConvert getConvert()
{
return convert;
}
@@ -245,9 +245,9 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ public NotificationChain basicSetConvert(XmlConvert newConvert, NotificationChain msgs)
{
- XmlConvert_2_1 oldConvert = convert;
+ XmlConvert oldConvert = convert;
convert = newConvert;
if (eNotificationRequired())
{
@@ -265,7 +265,7 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
* @see #getConvert()
* @generated
*/
- public void setConvert(XmlConvert_2_1 newConvert)
+ public void setConvert(XmlConvert newConvert)
{
if (newConvert != convert)
{
@@ -640,7 +640,7 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
setColumn((XmlColumn)newValue);
return;
case OrmPackage.XML_ID__CONVERT:
- setConvert((XmlConvert_2_1)newValue);
+ setConvert((XmlConvert)newValue);
return;
case OrmPackage.XML_ID__LOB:
setLob((Boolean)newValue);
@@ -678,7 +678,7 @@ public class XmlId extends AbstractXmlAttributeMapping implements ColumnMapping,
setColumn((XmlColumn)null);
return;
case OrmPackage.XML_ID__CONVERT:
- setConvert((XmlConvert_2_1)null);
+ setConvert((XmlConvert)null);
return;
case OrmPackage.XML_ID__LOB:
setLob(LOB_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java
index 7a60c76..d7dc0d2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlJoinTable.java
@@ -59,7 +59,7 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 foreignKey;
+ protected XmlForeignKey foreignKey;
/**
* The cached value of the '{@link #getInverseForeignKey() <em>Inverse Foreign Key</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -68,7 +68,7 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 inverseForeignKey;
+ protected XmlForeignKey inverseForeignKey;
/**
* The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -118,12 +118,12 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getForeignKey()
+ public XmlForeignKey getForeignKey()
{
return foreignKey;
}
@@ -133,9 +133,9 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetForeignKey(XmlForeignKey newForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ XmlForeignKey oldForeignKey = foreignKey;
foreignKey = newForeignKey;
if (eNotificationRequired())
{
@@ -153,7 +153,7 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* @see #getForeignKey()
* @generated
*/
- public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ public void setForeignKey(XmlForeignKey newForeignKey)
{
if (newForeignKey != foreignKey)
{
@@ -178,12 +178,12 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Inverse Foreign Key</em>' containment reference.
- * @see #setInverseForeignKey(XmlForeignKey_2_1)
+ * @see #setInverseForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable_2_1_InverseForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getInverseForeignKey()
+ public XmlForeignKey getInverseForeignKey()
{
return inverseForeignKey;
}
@@ -193,9 +193,9 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetInverseForeignKey(XmlForeignKey_2_1 newInverseForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetInverseForeignKey(XmlForeignKey newInverseForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldInverseForeignKey = inverseForeignKey;
+ XmlForeignKey oldInverseForeignKey = inverseForeignKey;
inverseForeignKey = newInverseForeignKey;
if (eNotificationRequired())
{
@@ -213,7 +213,7 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
* @see #getInverseForeignKey()
* @generated
*/
- public void setInverseForeignKey(XmlForeignKey_2_1 newInverseForeignKey)
+ public void setInverseForeignKey(XmlForeignKey newInverseForeignKey)
{
if (newInverseForeignKey != inverseForeignKey)
{
@@ -331,10 +331,10 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
switch (featureID)
{
case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)newValue);
+ setForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
- setInverseForeignKey((XmlForeignKey_2_1)newValue);
+ setInverseForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_JOIN_TABLE__INDEXES:
getIndexes().clear();
@@ -359,10 +359,10 @@ public class XmlJoinTable extends AbstractXmlReferenceTable implements XmlJoinTa
switch (featureID)
{
case OrmPackage.XML_JOIN_TABLE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)null);
+ setForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_JOIN_TABLE__INVERSE_FOREIGN_KEY:
- setInverseForeignKey((XmlForeignKey_2_1)null);
+ setInverseForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_JOIN_TABLE__INDEXES:
getIndexes().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java
index d5e04ce..2b3d267 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToMany.java
@@ -55,7 +55,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> mapKeyConverts;
+ protected EList<XmlConvert> mapKeyConverts;
/**
* The cached value of the '{@link #getMapKeyForeignKey() <em>Map Key Foreign Key</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -64,7 +64,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 mapKeyForeignKey;
+ protected XmlForeignKey mapKeyForeignKey;
/**
* <!-- begin-user-doc -->
@@ -89,7 +89,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -101,11 +101,11 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getMapKeyConverts()
+ public EList<XmlConvert> getMapKeyConverts()
{
if (mapKeyConverts == null)
{
- mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS);
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS);
}
return mapKeyConverts;
}
@@ -119,12 +119,12 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
- * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setMapKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToMany_2_1_MapKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getMapKeyForeignKey()
+ public XmlForeignKey getMapKeyForeignKey()
{
return mapKeyForeignKey;
}
@@ -134,9 +134,9 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey newMapKeyForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldMapKeyForeignKey = mapKeyForeignKey;
+ XmlForeignKey oldMapKeyForeignKey = mapKeyForeignKey;
mapKeyForeignKey = newMapKeyForeignKey;
if (eNotificationRequired())
{
@@ -154,7 +154,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
* @see #getMapKeyForeignKey()
* @generated
*/
- public void setMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey)
+ public void setMapKeyForeignKey(XmlForeignKey newMapKeyForeignKey)
{
if (newMapKeyForeignKey != mapKeyForeignKey)
{
@@ -219,10 +219,10 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERTS:
getMapKeyConverts().clear();
- getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
- setMapKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setMapKeyForeignKey((XmlForeignKey)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -242,7 +242,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
getMapKeyConverts().clear();
return;
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_FOREIGN_KEY:
- setMapKeyForeignKey((XmlForeignKey_2_1)null);
+ setMapKeyForeignKey((XmlForeignKey)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java
index c1693b4..199c035 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManyToOne.java
@@ -50,7 +50,7 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implement
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 foreignKey;
+ protected XmlForeignKey foreignKey;
/**
* <!-- begin-user-doc -->
@@ -82,12 +82,12 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implement
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToOne_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getForeignKey()
+ public XmlForeignKey getForeignKey()
{
return foreignKey;
}
@@ -97,9 +97,9 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implement
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetForeignKey(XmlForeignKey newForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ XmlForeignKey oldForeignKey = foreignKey;
foreignKey = newForeignKey;
if (eNotificationRequired())
{
@@ -117,7 +117,7 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implement
* @see #getForeignKey()
* @generated
*/
- public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ public void setForeignKey(XmlForeignKey newForeignKey)
{
if (newForeignKey != foreignKey)
{
@@ -176,7 +176,7 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implement
switch (featureID)
{
case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)newValue);
+ setForeignKey((XmlForeignKey)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -193,7 +193,7 @@ public class XmlManyToOne extends AbstractXmlSingleRelationshipMapping implement
switch (featureID)
{
case OrmPackage.XML_MANY_TO_ONE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)null);
+ setForeignKey((XmlForeignKey)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java
index 31d32d1..b413648 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedEntityGraph.java
@@ -61,7 +61,7 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
* @generated
* @ordered
*/
- protected EList<XmlNamedAttributeNode_2_1> namedAttributeNodes;
+ protected EList<XmlNamedAttributeNode> namedAttributeNodes;
/**
* The cached value of the '{@link #getSubgraphs() <em>Subgraphs</em>}' containment reference list.
@@ -71,7 +71,7 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
* @generated
* @ordered
*/
- protected EList<XmlNamedSubgraph_2_1> subgraphs;
+ protected EList<XmlNamedSubgraph> subgraphs;
/**
* The cached value of the '{@link #getSubclassSubgraphs() <em>Subclass Subgraphs</em>}' containment reference list.
@@ -81,7 +81,7 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
* @generated
* @ordered
*/
- protected EList<XmlNamedSubgraph_2_1> subclassSubgraphs;
+ protected EList<XmlNamedSubgraph> subclassSubgraphs;
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -146,7 +146,7 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
/**
* Returns the value of the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Attribute Nodes</em>' containment reference list isn't clear,
@@ -158,18 +158,18 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
* @model containment="true"
* @generated
*/
- public EList<XmlNamedAttributeNode_2_1> getNamedAttributeNodes()
+ public EList<XmlNamedAttributeNode> getNamedAttributeNodes()
{
if (namedAttributeNodes == null)
{
- namedAttributeNodes = new EObjectContainmentEList<XmlNamedAttributeNode_2_1>(XmlNamedAttributeNode_2_1.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES);
+ namedAttributeNodes = new EObjectContainmentEList<XmlNamedAttributeNode>(XmlNamedAttributeNode.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES);
}
return namedAttributeNodes;
}
/**
* Returns the value of the '<em><b>Subgraphs</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Subgraphs</em>' containment reference list isn't clear,
@@ -181,18 +181,18 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
* @model containment="true"
* @generated
*/
- public EList<XmlNamedSubgraph_2_1> getSubgraphs()
+ public EList<XmlNamedSubgraph> getSubgraphs()
{
if (subgraphs == null)
{
- subgraphs = new EObjectContainmentEList<XmlNamedSubgraph_2_1>(XmlNamedSubgraph_2_1.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS);
+ subgraphs = new EObjectContainmentEList<XmlNamedSubgraph>(XmlNamedSubgraph.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS);
}
return subgraphs;
}
/**
* Returns the value of the '<em><b>Subclass Subgraphs</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Subclass Subgraphs</em>' containment reference list isn't clear,
@@ -204,11 +204,11 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
* @model containment="true"
* @generated
*/
- public EList<XmlNamedSubgraph_2_1> getSubclassSubgraphs()
+ public EList<XmlNamedSubgraph> getSubclassSubgraphs()
{
if (subclassSubgraphs == null)
{
- subclassSubgraphs = new EObjectContainmentEList<XmlNamedSubgraph_2_1>(XmlNamedSubgraph_2_1.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS);
+ subclassSubgraphs = new EObjectContainmentEList<XmlNamedSubgraph>(XmlNamedSubgraph.class, this, OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS);
}
return subclassSubgraphs;
}
@@ -340,15 +340,15 @@ public class XmlNamedEntityGraph extends EBaseObjectImpl implements XmlNamedEnti
{
case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAMED_ATTRIBUTE_NODES:
getNamedAttributeNodes().clear();
- getNamedAttributeNodes().addAll((Collection<? extends XmlNamedAttributeNode_2_1>)newValue);
+ getNamedAttributeNodes().addAll((Collection<? extends XmlNamedAttributeNode>)newValue);
return;
case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBGRAPHS:
getSubgraphs().clear();
- getSubgraphs().addAll((Collection<? extends XmlNamedSubgraph_2_1>)newValue);
+ getSubgraphs().addAll((Collection<? extends XmlNamedSubgraph>)newValue);
return;
case OrmPackage.XML_NAMED_ENTITY_GRAPH__SUBCLASS_SUBGRAPHS:
getSubclassSubgraphs().clear();
- getSubclassSubgraphs().addAll((Collection<? extends XmlNamedSubgraph_2_1>)newValue);
+ getSubclassSubgraphs().addAll((Collection<? extends XmlNamedSubgraph>)newValue);
return;
case OrmPackage.XML_NAMED_ENTITY_GRAPH__NAME:
setName((String)newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
index 1397855..19cd5db 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java
@@ -53,7 +53,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class"
* @generated
*/
-public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlNamedStoredProcedureQuery_2_1
+public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlQuery, XmlNamedStoredProcedureQuery_2_1
{
/**
* The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
@@ -153,7 +153,7 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml
* @generated
* @ordered
*/
- protected EList<XmlStoredProcedureParameter_2_1> parameters;
+ protected EList<XmlStoredProcedureParameter> parameters;
/**
* <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml
/**
* Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Parameters</em>' reference list isn't clear,
@@ -364,11 +364,11 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml
* @model containment="true"
* @generated
*/
- public EList<XmlStoredProcedureParameter_2_1> getParameters()
+ public EList<XmlStoredProcedureParameter> getParameters()
{
if (parameters == null)
{
- parameters = new EObjectContainmentEList<XmlStoredProcedureParameter_2_1>(XmlStoredProcedureParameter_2_1.class, this, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS);
+ parameters = new EObjectContainmentEList<XmlStoredProcedureParameter>(XmlStoredProcedureParameter.class, this, OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS);
}
return parameters;
}
@@ -453,7 +453,7 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml
return;
case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
getParameters().clear();
- getParameters().addAll((Collection<? extends XmlStoredProcedureParameter_2_1>)newValue);
+ getParameters().addAll((Collection<? extends XmlStoredProcedureParameter>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -528,6 +528,50 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml
* @generated
*/
@Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlNamedStoredProcedureQuery_2_1.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME;
+ case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS;
+ default: return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+ {
+ if (baseClass == XmlNamedStoredProcedureQuery_2_1.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES;
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS;
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME;
+ case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS;
+ default: return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public String toString()
{
if (eIsProxy()) return super.toString();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java
index 43b238f..7558a71 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedSubgraph.java
@@ -60,7 +60,7 @@ public class XmlNamedSubgraph extends EBaseObjectImpl implements XmlNamedSubgrap
* @generated
* @ordered
*/
- protected EList<XmlNamedAttributeNode_2_1> namedAttributeNodes;
+ protected EList<XmlNamedAttributeNode> namedAttributeNodes;
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -125,7 +125,7 @@ public class XmlNamedSubgraph extends EBaseObjectImpl implements XmlNamedSubgrap
/**
* Returns the value of the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Attribute Nodes</em>' containment reference list isn't clear,
@@ -137,11 +137,11 @@ public class XmlNamedSubgraph extends EBaseObjectImpl implements XmlNamedSubgrap
* @model containment="true"
* @generated
*/
- public EList<XmlNamedAttributeNode_2_1> getNamedAttributeNodes()
+ public EList<XmlNamedAttributeNode> getNamedAttributeNodes()
{
if (namedAttributeNodes == null)
{
- namedAttributeNodes = new EObjectContainmentEList<XmlNamedAttributeNode_2_1>(XmlNamedAttributeNode_2_1.class, this, OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES);
+ namedAttributeNodes = new EObjectContainmentEList<XmlNamedAttributeNode>(XmlNamedAttributeNode.class, this, OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES);
}
return namedAttributeNodes;
}
@@ -265,7 +265,7 @@ public class XmlNamedSubgraph extends EBaseObjectImpl implements XmlNamedSubgrap
{
case OrmPackage.XML_NAMED_SUBGRAPH__NAMED_ATTRIBUTE_NODES:
getNamedAttributeNodes().clear();
- getNamedAttributeNodes().addAll((Collection<? extends XmlNamedAttributeNode_2_1>)newValue);
+ getNamedAttributeNodes().addAll((Collection<? extends XmlNamedAttributeNode>)newValue);
return;
case OrmPackage.XML_NAMED_SUBGRAPH__NAME:
setName((String)newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java
index 1333cc1..d589241 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToMany.java
@@ -88,7 +88,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> mapKeyConverts;
+ protected EList<XmlConvert> mapKeyConverts;
/**
* The cached value of the '{@link #getMapKeyForeignKey() <em>Map Key Foreign Key</em>}' containment reference.
@@ -98,7 +98,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 mapKeyForeignKey;
+ protected XmlForeignKey mapKeyForeignKey;
/**
* The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
@@ -108,7 +108,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 foreignKey;
+ protected XmlForeignKey foreignKey;
/**
* <!-- begin-user-doc -->
@@ -191,7 +191,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -203,11 +203,11 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getMapKeyConverts()
+ public EList<XmlConvert> getMapKeyConverts()
{
if (mapKeyConverts == null)
{
- mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS);
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS);
}
return mapKeyConverts;
}
@@ -221,12 +221,12 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
- * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setMapKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany_2_1_MapKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getMapKeyForeignKey()
+ public XmlForeignKey getMapKeyForeignKey()
{
return mapKeyForeignKey;
}
@@ -236,9 +236,9 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetMapKeyForeignKey(XmlForeignKey newMapKeyForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldMapKeyForeignKey = mapKeyForeignKey;
+ XmlForeignKey oldMapKeyForeignKey = mapKeyForeignKey;
mapKeyForeignKey = newMapKeyForeignKey;
if (eNotificationRequired())
{
@@ -256,7 +256,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* @see #getMapKeyForeignKey()
* @generated
*/
- public void setMapKeyForeignKey(XmlForeignKey_2_1 newMapKeyForeignKey)
+ public void setMapKeyForeignKey(XmlForeignKey newMapKeyForeignKey)
{
if (newMapKeyForeignKey != mapKeyForeignKey)
{
@@ -281,12 +281,12 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getForeignKey()
+ public XmlForeignKey getForeignKey()
{
return foreignKey;
}
@@ -296,9 +296,9 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetForeignKey(XmlForeignKey newForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ XmlForeignKey oldForeignKey = foreignKey;
foreignKey = newForeignKey;
if (eNotificationRequired())
{
@@ -316,7 +316,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* @see #getForeignKey()
* @generated
*/
- public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ public void setForeignKey(XmlForeignKey newForeignKey)
{
if (newForeignKey != foreignKey)
{
@@ -398,13 +398,13 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
return;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERTS:
getMapKeyConverts().clear();
- getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
- setMapKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setMapKeyForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)newValue);
+ setForeignKey((XmlForeignKey)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -430,10 +430,10 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
getMapKeyConverts().clear();
return;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_FOREIGN_KEY:
- setMapKeyForeignKey((XmlForeignKey_2_1)null);
+ setMapKeyForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_ONE_TO_MANY__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)null);
+ setForeignKey((XmlForeignKey)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java
index c5ba31e..0df3ca4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlOneToOne.java
@@ -106,7 +106,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* @generated
* @ordered
*/
- protected EList<XmlConvert_2_1> mapKeyConverts;
+ protected EList<XmlConvert> mapKeyConverts;
/**
* The cached value of the '{@link #getPrimaryKeyForeignKey() <em>Primary Key Foreign Key</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -115,7 +115,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 primaryKeyForeignKey;
+ protected XmlForeignKey primaryKeyForeignKey;
/**
* The cached value of the '{@link #getForeignKey() <em>Foreign Key</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -124,7 +124,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 foreignKey;
+ protected XmlForeignKey foreignKey;
/**
* <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -231,11 +231,11 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* @model containment="true"
* @generated
*/
- public EList<XmlConvert_2_1> getMapKeyConverts()
+ public EList<XmlConvert> getMapKeyConverts()
{
if (mapKeyConverts == null)
{
- mapKeyConverts = new EObjectContainmentEList<XmlConvert_2_1>(XmlConvert_2_1.class, this, OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS);
+ mapKeyConverts = new EObjectContainmentEList<XmlConvert>(XmlConvert.class, this, OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS);
}
return mapKeyConverts;
}
@@ -249,12 +249,12 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* </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.core.resource.orm.OrmPackage#getXmlOneToOne_2_1_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ public XmlForeignKey getPrimaryKeyForeignKey()
{
return primaryKeyForeignKey;
}
@@ -264,9 +264,9 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* <!-- 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())
{
@@ -284,7 +284,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ public void setPrimaryKeyForeignKey(XmlForeignKey newPrimaryKeyForeignKey)
{
if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
{
@@ -309,12 +309,12 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getForeignKey()
+ public XmlForeignKey getForeignKey()
{
return foreignKey;
}
@@ -324,9 +324,9 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetForeignKey(XmlForeignKey_2_1 newForeignKey, NotificationChain msgs)
+ public NotificationChain basicSetForeignKey(XmlForeignKey newForeignKey, NotificationChain msgs)
{
- XmlForeignKey_2_1 oldForeignKey = foreignKey;
+ XmlForeignKey oldForeignKey = foreignKey;
foreignKey = newForeignKey;
if (eNotificationRequired())
{
@@ -344,7 +344,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* @see #getForeignKey()
* @generated
*/
- public void setForeignKey(XmlForeignKey_2_1 newForeignKey)
+ public void setForeignKey(XmlForeignKey newForeignKey)
{
if (newForeignKey != foreignKey)
{
@@ -454,13 +454,13 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
return;
case OrmPackage.XML_ONE_TO_ONE__MAP_KEY_CONVERTS:
getMapKeyConverts().clear();
- getMapKeyConverts().addAll((Collection<? extends XmlConvert_2_1>)newValue);
+ getMapKeyConverts().addAll((Collection<? extends XmlConvert>)newValue);
return;
case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setPrimaryKeyForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)newValue);
+ setForeignKey((XmlForeignKey)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -489,10 +489,10 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
getMapKeyConverts().clear();
return;
case OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ setPrimaryKeyForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_ONE_TO_ONE__FOREIGN_KEY:
- setForeignKey((XmlForeignKey_2_1)null);
+ setForeignKey((XmlForeignKey)null);
return;
}
super.eUnset(featureID);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java
index 46e4400..7e2543e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSecondaryTable.java
@@ -59,7 +59,7 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
* @generated
* @ordered
*/
- protected XmlForeignKey_2_1 primaryKeyForeignKey;
+ protected XmlForeignKey primaryKeyForeignKey;
/**
* The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -68,7 +68,7 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
* @generated
* @ordered
*/
- protected EList<XmlIndex_2_1> indexes;
+ protected EList<XmlIndex> indexes;
/**
* The cached value of the '{@link #getPrimaryKeyJoinColumns() <em>Primary Key Join Columns</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -109,12 +109,12 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
* </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.core.resource.orm.OrmPackage#getXmlSecondaryTable_2_1_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- public XmlForeignKey_2_1 getPrimaryKeyForeignKey()
+ public XmlForeignKey getPrimaryKeyForeignKey()
{
return primaryKeyForeignKey;
}
@@ -124,9 +124,9 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
* <!-- 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())
{
@@ -144,7 +144,7 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- public void setPrimaryKeyForeignKey(XmlForeignKey_2_1 newPrimaryKeyForeignKey)
+ public void setPrimaryKeyForeignKey(XmlForeignKey newPrimaryKeyForeignKey)
{
if (newPrimaryKeyForeignKey != primaryKeyForeignKey)
{
@@ -162,7 +162,7 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -174,11 +174,11 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
* @model containment="true"
* @generated
*/
- public EList<XmlIndex_2_1> getIndexes()
+ public EList<XmlIndex> getIndexes()
{
if (indexes == null)
{
- indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_SECONDARY_TABLE__INDEXES);
+ indexes = new EObjectContainmentEList<XmlIndex>(XmlIndex.class, this, OrmPackage.XML_SECONDARY_TABLE__INDEXES);
}
return indexes;
}
@@ -258,11 +258,11 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
switch (featureID)
{
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)newValue);
+ setPrimaryKeyForeignKey((XmlForeignKey)newValue);
return;
case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
getIndexes().clear();
- getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ getIndexes().addAll((Collection<? extends XmlIndex>)newValue);
return;
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS:
getPrimaryKeyJoinColumns().clear();
@@ -283,7 +283,7 @@ public class XmlSecondaryTable extends AbstractXmlTable implements XmlSecondaryT
switch (featureID)
{
case OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_FOREIGN_KEY:
- setPrimaryKeyForeignKey((XmlForeignKey_2_1)null);
+ setPrimaryKeyForeignKey((XmlForeignKey)null);
return;
case OrmPackage.XML_SECONDARY_TABLE__INDEXES:
getIndexes().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java
index 1d671d3..755b1bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlSqlResultSetMapping.java
@@ -84,7 +84,7 @@ public class XmlSqlResultSetMapping extends EBaseObjectImpl implements XmlSqlRes
* @generated
* @ordered
*/
- protected EList<ConstructorResult_2_1> constructorResults;
+ protected EList<ConstructorResult> constructorResults;
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -184,7 +184,7 @@ public class XmlSqlResultSetMapping extends EBaseObjectImpl implements XmlSqlRes
/**
* Returns the value of the '<em><b>Constructor Results</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Constructor Results</em>' containment reference list isn't clear,
@@ -196,11 +196,11 @@ public class XmlSqlResultSetMapping extends EBaseObjectImpl implements XmlSqlRes
* @model containment="true"
* @generated
*/
- public EList<ConstructorResult_2_1> getConstructorResults()
+ public EList<ConstructorResult> getConstructorResults()
{
if (constructorResults == null)
{
- constructorResults = new EObjectContainmentEList<ConstructorResult_2_1>(ConstructorResult_2_1.class, this, OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS);
+ constructorResults = new EObjectContainmentEList<ConstructorResult>(ConstructorResult.class, this, OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS);
}
return constructorResults;
}
@@ -346,7 +346,7 @@ public class XmlSqlResultSetMapping extends EBaseObjectImpl implements XmlSqlRes
return;
case OrmPackage.XML_SQL_RESULT_SET_MAPPING__CONSTRUCTOR_RESULTS:
getConstructorResults().clear();
- getConstructorResults().addAll((Collection<? extends ConstructorResult_2_1>)newValue);
+ getConstructorResults().addAll((Collection<? extends ConstructorResult>)newValue);
return;
case OrmPackage.XML_SQL_RESULT_SET_MAPPING__NAME:
setName((String)newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java
index 57df6e6..1976962 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTable.java
@@ -50,7 +50,7 @@ public class XmlTable extends AbstractXmlTable implements XmlTable_2_1
* @generated
* @ordered
*/
- protected EList<XmlIndex_2_1> indexes;
+ protected EList<XmlIndex> indexes;
/**
* <!-- begin-user-doc -->
@@ -75,7 +75,7 @@ public class XmlTable extends AbstractXmlTable implements XmlTable_2_1
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -87,11 +87,11 @@ public class XmlTable extends AbstractXmlTable implements XmlTable_2_1
* @model containment="true"
* @generated
*/
- public EList<XmlIndex_2_1> getIndexes()
+ public EList<XmlIndex> getIndexes()
{
if (indexes == null)
{
- indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_TABLE__INDEXES);
+ indexes = new EObjectContainmentEList<XmlIndex>(XmlIndex.class, this, OrmPackage.XML_TABLE__INDEXES);
}
return indexes;
}
@@ -141,7 +141,7 @@ public class XmlTable extends AbstractXmlTable implements XmlTable_2_1
{
case OrmPackage.XML_TABLE__INDEXES:
getIndexes().clear();
- getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ getIndexes().addAll((Collection<? extends XmlIndex>)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
index b8214af..0f4f3ef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTableGenerator.java
@@ -147,7 +147,7 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator,
* @generated
* @ordered
*/
- protected EList<XmlIndex_2_1> indexes;
+ protected EList<XmlIndex> indexes;
/**
* The default value of the '{@link #getTable() <em>Table</em>}' attribute.
@@ -652,7 +652,7 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator,
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -664,11 +664,11 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator,
* @model containment="true"
* @generated
*/
- public EList<XmlIndex_2_1> getIndexes()
+ public EList<XmlIndex> getIndexes()
{
if (indexes == null)
{
- indexes = new EObjectContainmentEList<XmlIndex_2_1>(XmlIndex_2_1.class, this, OrmPackage.XML_TABLE_GENERATOR__INDEXES);
+ indexes = new EObjectContainmentEList<XmlIndex>(XmlIndex.class, this, OrmPackage.XML_TABLE_GENERATOR__INDEXES);
}
return indexes;
}
@@ -777,7 +777,7 @@ public class XmlTableGenerator extends EBaseObjectImpl implements XmlGenerator,
return;
case OrmPackage.XML_TABLE_GENERATOR__INDEXES:
getIndexes().clear();
- getIndexes().addAll((Collection<? extends XmlIndex_2_1>)newValue);
+ getIndexes().addAll((Collection<? extends XmlIndex>)newValue);
return;
case OrmPackage.XML_TABLE_GENERATOR__TABLE:
setTable((String)newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java
index de81c7b..1d5860c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlVersion.java
@@ -58,7 +58,7 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
* @generated
* @ordered
*/
- protected XmlConvert_2_1 convert;
+ protected XmlConvert convert;
/**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
* <!-- begin-user-doc -->
@@ -201,12 +201,12 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Convert</em>' containment reference.
- * @see #setConvert(XmlConvert_2_1)
+ * @see #setConvert(XmlConvert)
* @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping_2_1_Convert()
* @model containment="true"
* @generated
*/
- public XmlConvert_2_1 getConvert()
+ public XmlConvert getConvert()
{
return convert;
}
@@ -216,9 +216,9 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ public NotificationChain basicSetConvert(XmlConvert newConvert, NotificationChain msgs)
{
- XmlConvert_2_1 oldConvert = convert;
+ XmlConvert oldConvert = convert;
convert = newConvert;
if (eNotificationRequired())
{
@@ -236,7 +236,7 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
* @see #getConvert()
* @generated
*/
- public void setConvert(XmlConvert_2_1 newConvert)
+ public void setConvert(XmlConvert newConvert)
{
if (newConvert != convert)
{
@@ -419,7 +419,7 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
setColumn((XmlColumn)newValue);
return;
case OrmPackage.XML_VERSION__CONVERT:
- setConvert((XmlConvert_2_1)newValue);
+ setConvert((XmlConvert)newValue);
return;
case OrmPackage.XML_VERSION__LOB:
setLob((Boolean)newValue);
@@ -448,7 +448,7 @@ public class XmlVersion extends AbstractXmlAttributeMapping implements ColumnMap
setColumn((XmlColumn)null);
return;
case OrmPackage.XML_VERSION__CONVERT:
- setConvert((XmlConvert_2_1)null);
+ setConvert((XmlConvert)null);
return;
case OrmPackage.XML_VERSION__LOB:
setLob(LOB_EDEFAULT);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
index 432f7db..0b0e92c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/ConstructorResult_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.ColumnResult;
/**
* <!-- begin-user-doc -->
@@ -67,7 +68,7 @@ public interface ConstructorResult_2_1 extends EBaseObject
/**
* Returns the value of the '<em><b>Column Results</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ColumnResult_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.ColumnResult}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Column Results</em>' reference list isn't clear,
@@ -79,6 +80,6 @@ public interface ConstructorResult_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<ColumnResult_2_1> getColumnResults();
+ EList<ColumnResult> getColumnResults();
} // ConstructorResult_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
index f1bdc2e..96b95d4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java
@@ -281,31 +281,13 @@ public class OrmV2_1Package extends EPackageImpl
public static final int XML_CONVERTER_21 = 5;
/**
- * The feature id for the '<em><b>Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_CONVERTER_21__CLASS_NAME = OrmPackage.XML_MANAGED_TYPE__CLASS_NAME;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_CONVERTER_21__DESCRIPTION = OrmPackage.XML_MANAGED_TYPE__DESCRIPTION;
-
- /**
* The feature id for the '<em><b>Auto Apply</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_CONVERTER_21__AUTO_APPLY = OrmPackage.XML_MANAGED_TYPE_FEATURE_COUNT + 0;
+ public static final int XML_CONVERTER_21__AUTO_APPLY = 0;
/**
* The number of structural features of the '<em>Xml Converter 21</em>' class.
@@ -314,7 +296,7 @@ public class OrmV2_1Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_CONVERTER_21_FEATURE_COUNT = OrmPackage.XML_MANAGED_TYPE_FEATURE_COUNT + 1;
+ public static final int XML_CONVERTER_21_FEATURE_COUNT = 1;
/**
* The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1 <em>Xml Converter Container 21</em>}' class.
@@ -988,40 +970,13 @@ public class OrmV2_1Package extends EPackageImpl
public static final int XML_NAMED_ENTITY_GRAPH_21_FEATURE_COUNT = 5;
/**
- * The feature id for the '<em><b>Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__DESCRIPTION = OrmPackage.XML_QUERY__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__NAME = OrmPackage.XML_QUERY__NAME;
-
- /**
- * The feature id for the '<em><b>Hints</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__HINTS = OrmPackage.XML_QUERY__HINTS;
-
- /**
* The feature id for the '<em><b>Result Classes</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES = OrmPackage.XML_QUERY_FEATURE_COUNT + 0;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES = 0;
/**
* The feature id for the '<em><b>Result Set Mappings</b></em>' attribute list.
@@ -1030,7 +985,7 @@ public class OrmV2_1Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS = OrmPackage.XML_QUERY_FEATURE_COUNT + 1;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS = 1;
/**
* The feature id for the '<em><b>Procedure Name</b></em>' attribute.
@@ -1039,7 +994,7 @@ public class OrmV2_1Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME = OrmPackage.XML_QUERY_FEATURE_COUNT + 2;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME = 2;
/**
* The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -1048,7 +1003,7 @@ public class OrmV2_1Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS = OrmPackage.XML_QUERY_FEATURE_COUNT + 3;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS = 3;
/**
* The number of structural features of the '<em>Xml Named Stored Procedure Query 21</em>' class.
@@ -1057,7 +1012,7 @@ public class OrmV2_1Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT = OrmPackage.XML_QUERY_FEATURE_COUNT + 4;
+ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT = 4;
/**
* The feature id for the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
@@ -3181,11 +3136,9 @@ public class OrmV2_1Package extends EPackageImpl
// Set bounds for type parameters
// Add supertypes to classes
- xmlConverter_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlManagedType());
xmlEntity_2_1EClass.getESuperTypes().add(this.getXmlQueryContainer_2_1());
xmlEntityMappings_2_1EClass.getESuperTypes().add(this.getXmlConverterContainer_2_1());
xmlEntityMappings_2_1EClass.getESuperTypes().add(this.getXmlQueryContainer_2_1());
- xmlNamedStoredProcedureQuery_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlQuery());
// Initialize classes and features; add operations and parameters
initEClass(columnResult_2_1EClass, ColumnResult_2_1.class, "ColumnResult_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3193,14 +3146,14 @@ public class OrmV2_1Package extends EPackageImpl
initEClass(constructorResult_2_1EClass, ConstructorResult_2_1.class, "ConstructorResult_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getConstructorResult_2_1_TargetClass(), theXMLTypePackage.getString(), "targetClass", null, 1, 1, ConstructorResult_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getConstructorResult_2_1_ColumnResults(), this.getColumnResult_2_1(), null, "columnResults", null, 0, -1, ConstructorResult_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getConstructorResult_2_1_ColumnResults(), theOrmPackage.getColumnResult(), null, "columnResults", null, 0, -1, ConstructorResult_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlAssociationOverride_2_1EClass, XmlAssociationOverride_2_1.class, "XmlAssociationOverride_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlAssociationOverride_2_1_ForeignKey(), this.getXmlForeignKey_2_1(), null, "foreignKey", null, 0, 1, XmlAssociationOverride_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlAssociationOverride_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlAssociationOverride_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlCollectionTable_2_1EClass, XmlCollectionTable_2_1.class, "XmlCollectionTable_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlCollectionTable_2_1_ForeignKey(), this.getXmlForeignKey_2_1(), null, "foreignKey", null, 0, 1, XmlCollectionTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlCollectionTable_2_1_Indexes(), this.getXmlIndex_2_1(), null, "indexes", null, 0, -1, XmlCollectionTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlCollectionTable_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlCollectionTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlCollectionTable_2_1_Indexes(), theOrmPackage.getXmlIndex(), null, "indexes", null, 0, -1, XmlCollectionTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlConvert_2_1EClass, XmlConvert_2_1.class, "XmlConvert_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlConvert_2_1_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlConvert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3212,23 +3165,23 @@ public class OrmV2_1Package extends EPackageImpl
initEAttribute(getXmlConverter_2_1_AutoApply(), theXMLTypePackage.getBooleanObject(), "autoApply", null, 0, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlConverterContainer_2_1EClass, XmlConverterContainer_2_1.class, "XmlConverterContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlConverterContainer_2_1_Converters(), this.getXmlConverter_2_1(), null, "converters", null, 0, -1, XmlConverterContainer_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlConverterContainer_2_1_Converters(), theOrmPackage.getXmlConverter(), null, "converters", null, 0, -1, XmlConverterContainer_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlConvertibleMapping_2_1EClass, XmlConvertibleMapping_2_1.class, "XmlConvertibleMapping_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlConvertibleMapping_2_1_Convert(), this.getXmlConvert_2_1(), null, "convert", null, 0, 1, XmlConvertibleMapping_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlConvertibleMapping_2_1_Convert(), theOrmPackage.getXmlConvert(), null, "convert", null, 0, 1, XmlConvertibleMapping_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlElementCollection_2_1EClass, XmlElementCollection_2_1.class, "XmlElementCollection_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlElementCollection_2_1_MapKeyConverts(), this.getXmlConvert_2_1(), null, "mapKeyConverts", null, 0, -1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlElementCollection_2_1_MapKeyForeignKey(), this.getXmlForeignKey_2_1(), null, "mapKeyForeignKey", null, 0, 1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlElementCollection_2_1_Converts(), this.getXmlConvert_2_1(), null, "converts", null, 0, -1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlElementCollection_2_1_MapKeyConverts(), theOrmPackage.getXmlConvert(), null, "mapKeyConverts", null, 0, -1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlElementCollection_2_1_MapKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "mapKeyForeignKey", null, 0, 1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlElementCollection_2_1_Converts(), theOrmPackage.getXmlConvert(), null, "converts", null, 0, -1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEmbedded_2_1EClass, XmlEmbedded_2_1.class, "XmlEmbedded_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEmbedded_2_1_Converts(), this.getXmlConvert_2_1(), null, "converts", null, 0, -1, XmlEmbedded_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEmbedded_2_1_Converts(), theOrmPackage.getXmlConvert(), null, "converts", null, 0, -1, XmlEmbedded_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntity_2_1EClass, XmlEntity_2_1.class, "XmlEntity_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlEntity_2_1_PrimaryKeyForeignKey(), this.getXmlForeignKey_2_1(), null, "primaryKeyForeignKey", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_1_Converts(), this.getXmlConvert_2_1(), null, "converts", null, 0, -1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlEntity_2_1_NamedEntityGraphs(), this.getXmlNamedEntityGraph_2_1(), null, "namedEntityGraphs", null, 0, -1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_1_PrimaryKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "primaryKeyForeignKey", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_1_Converts(), theOrmPackage.getXmlConvert(), null, "converts", null, 0, -1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlEntity_2_1_NamedEntityGraphs(), theOrmPackage.getXmlNamedEntityGraph(), null, "namedEntityGraphs", null, 0, -1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlEntityMappings_2_1EClass, XmlEntityMappings_2_1.class, "XmlEntityMappings_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3245,16 +3198,16 @@ public class OrmV2_1Package extends EPackageImpl
initEAttribute(getXmlIndex_2_1_Unique(), theXMLTypePackage.getBooleanObject(), "unique", null, 0, 1, XmlIndex_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlJoinTable_2_1EClass, XmlJoinTable_2_1.class, "XmlJoinTable_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlJoinTable_2_1_ForeignKey(), this.getXmlForeignKey_2_1(), null, "foreignKey", null, 0, 1, XmlJoinTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlJoinTable_2_1_InverseForeignKey(), this.getXmlForeignKey_2_1(), null, "inverseForeignKey", null, 0, 1, XmlJoinTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlJoinTable_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlJoinTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlJoinTable_2_1_InverseForeignKey(), theOrmPackage.getXmlForeignKey(), null, "inverseForeignKey", null, 0, 1, XmlJoinTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlJoinTable_2_1_Indexes(), this.getXmlIndex_2_1(), null, "indexes", null, 0, -1, XmlJoinTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlManyToMany_2_1EClass, XmlManyToMany_2_1.class, "XmlManyToMany_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlManyToMany_2_1_MapKeyConverts(), this.getXmlConvert_2_1(), null, "mapKeyConverts", null, 0, -1, XmlManyToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlManyToMany_2_1_MapKeyForeignKey(), this.getXmlForeignKey_2_1(), null, "mapKeyForeignKey", null, 0, 1, XmlManyToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlManyToMany_2_1_MapKeyConverts(), theOrmPackage.getXmlConvert(), null, "mapKeyConverts", null, 0, -1, XmlManyToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlManyToMany_2_1_MapKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "mapKeyForeignKey", null, 0, 1, XmlManyToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlManyToOne_2_1EClass, XmlManyToOne_2_1.class, "XmlManyToOne_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlManyToOne_2_1_ForeignKey(), this.getXmlForeignKey_2_1(), null, "foreignKey", null, 0, 1, XmlManyToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlManyToOne_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlManyToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlNamedAttributeNode_2_1EClass, XmlNamedAttributeNode_2_1.class, "XmlNamedAttributeNode_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlNamedAttributeNode_2_1_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlNamedAttributeNode_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3262,9 +3215,9 @@ public class OrmV2_1Package extends EPackageImpl
initEAttribute(getXmlNamedAttributeNode_2_1_KeySubgraph(), theXMLTypePackage.getString(), "keySubgraph", null, 0, 1, XmlNamedAttributeNode_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlNamedEntityGraph_2_1EClass, XmlNamedEntityGraph_2_1.class, "XmlNamedEntityGraph_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlNamedEntityGraph_2_1_NamedAttributeNodes(), this.getXmlNamedAttributeNode_2_1(), null, "namedAttributeNodes", null, 0, -1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlNamedEntityGraph_2_1_Subgraphs(), this.getXmlNamedSubgraph_2_1(), null, "subgraphs", null, 0, -1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlNamedEntityGraph_2_1_SubclassSubgraphs(), this.getXmlNamedSubgraph_2_1(), null, "subclassSubgraphs", null, 0, -1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlNamedEntityGraph_2_1_NamedAttributeNodes(), theOrmPackage.getXmlNamedAttributeNode(), null, "namedAttributeNodes", null, 0, -1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlNamedEntityGraph_2_1_Subgraphs(), theOrmPackage.getXmlNamedSubgraph(), null, "subgraphs", null, 0, -1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlNamedEntityGraph_2_1_SubclassSubgraphs(), theOrmPackage.getXmlNamedSubgraph(), null, "subclassSubgraphs", null, 0, -1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedEntityGraph_2_1_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedEntityGraph_2_1_IncludeAllAttributes(), theXMLTypePackage.getBooleanObject(), "includeAllAttributes", null, 0, 1, XmlNamedEntityGraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3272,29 +3225,29 @@ public class OrmV2_1Package extends EPackageImpl
initEAttribute(getXmlNamedStoredProcedureQuery_2_1_ResultClasses(), theXMLTypePackage.getString(), "resultClasses", null, 0, -1, XmlNamedStoredProcedureQuery_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedStoredProcedureQuery_2_1_ResultSetMappings(), theXMLTypePackage.getString(), "resultSetMappings", null, 0, -1, XmlNamedStoredProcedureQuery_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedStoredProcedureQuery_2_1_ProcedureName(), theXMLTypePackage.getString(), "procedureName", null, 1, 1, XmlNamedStoredProcedureQuery_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlNamedStoredProcedureQuery_2_1_Parameters(), this.getXmlStoredProcedureParameter_2_1(), null, "parameters", null, 0, -1, XmlNamedStoredProcedureQuery_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlNamedStoredProcedureQuery_2_1_Parameters(), theOrmPackage.getXmlStoredProcedureParameter(), null, "parameters", null, 0, -1, XmlNamedStoredProcedureQuery_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlNamedSubgraph_2_1EClass, XmlNamedSubgraph_2_1.class, "XmlNamedSubgraph_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlNamedSubgraph_2_1_NamedAttributeNodes(), this.getXmlNamedAttributeNode_2_1(), null, "namedAttributeNodes", null, 0, -1, XmlNamedSubgraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlNamedSubgraph_2_1_NamedAttributeNodes(), theOrmPackage.getXmlNamedAttributeNode(), null, "namedAttributeNodes", null, 0, -1, XmlNamedSubgraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedSubgraph_2_1_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlNamedSubgraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlNamedSubgraph_2_1_ClassName(), theXMLTypePackage.getString(), "className", null, 0, 1, XmlNamedSubgraph_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlOneToMany_2_1EClass, XmlOneToMany_2_1.class, "XmlOneToMany_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlOneToMany_2_1_MapKeyConverts(), this.getXmlConvert_2_1(), null, "mapKeyConverts", null, 0, -1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlOneToMany_2_1_MapKeyForeignKey(), this.getXmlForeignKey_2_1(), null, "mapKeyForeignKey", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlOneToMany_2_1_ForeignKey(), this.getXmlForeignKey_2_1(), null, "foreignKey", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToMany_2_1_MapKeyConverts(), theOrmPackage.getXmlConvert(), null, "mapKeyConverts", null, 0, -1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToMany_2_1_MapKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "mapKeyForeignKey", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToMany_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlOneToOne_2_1EClass, XmlOneToOne_2_1.class, "XmlOneToOne_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlOneToOne_2_1_MapKeyConverts(), this.getXmlConvert_2_1(), null, "mapKeyConverts", null, 0, -1, XmlOneToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlOneToOne_2_1_PrimaryKeyForeignKey(), this.getXmlForeignKey_2_1(), null, "primaryKeyForeignKey", null, 0, 1, XmlOneToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlOneToOne_2_1_ForeignKey(), this.getXmlForeignKey_2_1(), null, "foreignKey", null, 0, 1, XmlOneToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToOne_2_1_MapKeyConverts(), theOrmPackage.getXmlConvert(), null, "mapKeyConverts", null, 0, -1, XmlOneToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToOne_2_1_PrimaryKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "primaryKeyForeignKey", null, 0, 1, XmlOneToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlOneToOne_2_1_ForeignKey(), theOrmPackage.getXmlForeignKey(), null, "foreignKey", null, 0, 1, XmlOneToOne_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlQueryContainer_2_1EClass, XmlQueryContainer_2_1.class, "XmlQueryContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlQueryContainer_2_1_NamedStoredProcedureQueries(), theOrmPackage.getXmlNamedStoredProcedureQuery(), null, "namedStoredProcedureQueries", null, 0, -1, XmlQueryContainer_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlSecondaryTable_2_1EClass, XmlSecondaryTable_2_1.class, "XmlSecondaryTable_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlSecondaryTable_2_1_PrimaryKeyForeignKey(), this.getXmlForeignKey_2_1(), null, "primaryKeyForeignKey", null, 0, 1, XmlSecondaryTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getXmlSecondaryTable_2_1_Indexes(), this.getXmlIndex_2_1(), null, "indexes", null, 0, -1, XmlSecondaryTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlSecondaryTable_2_1_PrimaryKeyForeignKey(), theOrmPackage.getXmlForeignKey(), null, "primaryKeyForeignKey", null, 0, 1, XmlSecondaryTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlSecondaryTable_2_1_Indexes(), theOrmPackage.getXmlIndex(), null, "indexes", null, 0, -1, XmlSecondaryTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlStoredProcedureParameter_2_1EClass, XmlStoredProcedureParameter_2_1.class, "XmlStoredProcedureParameter_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlStoredProcedureParameter_2_1_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3303,13 +3256,13 @@ public class OrmV2_1Package extends EPackageImpl
initEAttribute(getXmlStoredProcedureParameter_2_1_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlSqlResultSetMapping_2_1EClass, XmlSqlResultSetMapping_2_1.class, "XmlSqlResultSetMapping_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlSqlResultSetMapping_2_1_ConstructorResults(), this.getConstructorResult_2_1(), null, "constructorResults", null, 0, -1, XmlSqlResultSetMapping_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlSqlResultSetMapping_2_1_ConstructorResults(), theOrmPackage.getConstructorResult(), null, "constructorResults", null, 0, -1, XmlSqlResultSetMapping_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlTable_2_1EClass, XmlTable_2_1.class, "XmlTable_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlTable_2_1_Indexes(), this.getXmlIndex_2_1(), null, "indexes", null, 0, -1, XmlTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlTable_2_1_Indexes(), theOrmPackage.getXmlIndex(), null, "indexes", null, 0, -1, XmlTable_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlTableGenerator_2_1EClass, XmlTableGenerator_2_1.class, "XmlTableGenerator_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getXmlTableGenerator_2_1_Indexes(), this.getXmlIndex_2_1(), null, "indexes", null, 0, -1, XmlTableGenerator_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getXmlTableGenerator_2_1_Indexes(), theOrmPackage.getXmlIndex(), null, "indexes", null, 0, -1, XmlTableGenerator_2_1.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(parameterMode_2_1EEnum, ParameterMode_2_1.class, "ParameterMode_2_1");
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlAssociationOverride_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlAssociationOverride_2_1.java
index 2b5c65f..d6581ec 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlAssociationOverride_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlAssociationOverride_2_1.java
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlAssociationOverride_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlAssociationOverride_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getForeignKey();
+ XmlForeignKey getForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlAssociationOverride_2_1#getForeignKey <em>Foreign Key</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlAssociationOverride_2_1 extends EBaseObject
* @see #getForeignKey()
* @generated
*/
- void setForeignKey(XmlForeignKey_2_1 value);
+ void setForeignKey(XmlForeignKey value);
} // XmlAssociationOverride_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlCollectionTable_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlCollectionTable_2_1.java
index 3e4ce11..ffc80d8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlCollectionTable_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlCollectionTable_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -48,12 +50,12 @@ public interface XmlCollectionTable_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlCollectionTable_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getForeignKey();
+ XmlForeignKey getForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlCollectionTable_2_1#getForeignKey <em>Foreign Key</em>}' containment reference.
@@ -63,11 +65,11 @@ public interface XmlCollectionTable_2_1 extends EBaseObject
* @see #getForeignKey()
* @generated
*/
- void setForeignKey(XmlForeignKey_2_1 value);
+ void setForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -79,6 +81,6 @@ public interface XmlCollectionTable_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlIndex_2_1> getIndexes();
+ EList<XmlIndex> getIndexes();
} // XmlCollectionTable_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverterContainer_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverterContainer_2_1.java
index a30b1db..c0329d7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverterContainer_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverterContainer_2_1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 3013 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.
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
/**
* <!-- begin-user-doc -->
@@ -40,7 +41,7 @@ public interface XmlConverterContainer_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' reference list isn't clear,
@@ -52,6 +53,6 @@ public interface XmlConverterContainer_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConverter_2_1> getConverters();
+ EList<XmlConverter> getConverters();
} // XmlConverterContainer_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java
index aef0850..49e6da0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
+import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
import org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType;
/**
@@ -31,9 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType;
*
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConverter_2_1()
* @model kind="class" interface="true" abstract="true"
+ * @extends EBaseObject
* @generated
*/
-public interface XmlConverter_2_1 extends XmlManagedType
+public interface XmlConverter_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Auto Apply</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvertibleMapping_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvertibleMapping_2_1.java
index d8ed2ad..fd216d7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvertibleMapping_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConvertibleMapping_2_1.java
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlConvertibleMapping_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Convert</em>' containment reference.
- * @see #setConvert(XmlConvert_2_1)
+ * @see #setConvert(XmlConvert)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConvertibleMapping_2_1_Convert()
* @model containment="true"
* @generated
*/
- XmlConvert_2_1 getConvert();
+ XmlConvert getConvert();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1#getConvert <em>Convert</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlConvertibleMapping_2_1 extends EBaseObject
* @see #getConvert()
* @generated
*/
- void setConvert(XmlConvert_2_1 value);
+ void setConvert(XmlConvert value);
} // XmlConvertibleMapping_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlElementCollection_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlElementCollection_2_1.java
index 1b80dc7..3da55f2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlElementCollection_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlElementCollection_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -42,7 +44,7 @@ public interface XmlElementCollection_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -54,7 +56,7 @@ public interface XmlElementCollection_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getMapKeyConverts();
+ EList<XmlConvert> getMapKeyConverts();
/**
* Returns the value of the '<em><b>Map Key Foreign Key</b></em>' containment reference.
@@ -65,12 +67,12 @@ public interface XmlElementCollection_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
- * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setMapKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlElementCollection_2_1_MapKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getMapKeyForeignKey();
+ XmlForeignKey getMapKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlElementCollection_2_1#getMapKeyForeignKey <em>Map Key Foreign Key</em>}' containment reference.
@@ -80,11 +82,11 @@ public interface XmlElementCollection_2_1 extends EBaseObject
* @see #getMapKeyForeignKey()
* @generated
*/
- void setMapKeyForeignKey(XmlForeignKey_2_1 value);
+ void setMapKeyForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converts</em>' containment reference list isn't clear,
@@ -96,6 +98,6 @@ public interface XmlElementCollection_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getConverts();
+ EList<XmlConvert> getConverts();
} // XmlElementCollection_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEmbedded_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEmbedded_2_1.java
index 305c5a9..823e817 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEmbedded_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEmbedded_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
/**
* <!-- begin-user-doc -->
@@ -40,7 +41,7 @@ public interface XmlEmbedded_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converts</em>' containment reference list isn't clear,
@@ -52,6 +53,6 @@ public interface XmlEmbedded_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getConverts();
+ EList<XmlConvert> getConverts();
} // XmlEmbedded_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntity_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntity_2_1.java
index 08bcff9..f39d81f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntity_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlEntity_2_1.java
@@ -10,6 +10,9 @@
package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph;
/**
* <!-- begin-user-doc -->
@@ -46,12 +49,12 @@ public interface XmlEntity_2_1 extends XmlQueryContainer_2_1
* </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.core.resource.orm.v2_1.OrmV2_1Package#getXmlEntity_2_1_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getPrimaryKeyForeignKey();
+ XmlForeignKey getPrimaryKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlEntity_2_1#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
@@ -61,11 +64,11 @@ public interface XmlEntity_2_1 extends XmlQueryContainer_2_1
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- void setPrimaryKeyForeignKey(XmlForeignKey_2_1 value);
+ void setPrimaryKeyForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converts</em>' containment reference list isn't clear,
@@ -77,11 +80,11 @@ public interface XmlEntity_2_1 extends XmlQueryContainer_2_1
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getConverts();
+ EList<XmlConvert> getConverts();
/**
* Returns the value of the '<em><b>Named Entity Graphs</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedEntityGraph_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedEntityGraph}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Entity Graphs</em>' containment reference list isn't clear,
@@ -93,6 +96,6 @@ public interface XmlEntity_2_1 extends XmlQueryContainer_2_1
* @model containment="true"
* @generated
*/
- EList<XmlNamedEntityGraph_2_1> getNamedEntityGraphs();
+ EList<XmlNamedEntityGraph> getNamedEntityGraphs();
} // XmlEntity_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlJoinTable_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlJoinTable_2_1.java
index 41d8b98..a25465d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlJoinTable_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlJoinTable_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -49,12 +50,12 @@ public interface XmlJoinTable_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlJoinTable_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getForeignKey();
+ XmlForeignKey getForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlJoinTable_2_1#getForeignKey <em>Foreign Key</em>}' containment reference.
@@ -64,7 +65,7 @@ public interface XmlJoinTable_2_1 extends EBaseObject
* @see #getForeignKey()
* @generated
*/
- void setForeignKey(XmlForeignKey_2_1 value);
+ void setForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Inverse Foreign Key</b></em>' containment reference.
@@ -75,12 +76,12 @@ public interface XmlJoinTable_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Inverse Foreign Key</em>' containment reference.
- * @see #setInverseForeignKey(XmlForeignKey_2_1)
+ * @see #setInverseForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlJoinTable_2_1_InverseForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getInverseForeignKey();
+ XmlForeignKey getInverseForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlJoinTable_2_1#getInverseForeignKey <em>Inverse Foreign Key</em>}' containment reference.
@@ -90,7 +91,7 @@ public interface XmlJoinTable_2_1 extends EBaseObject
* @see #getInverseForeignKey()
* @generated
*/
- void setInverseForeignKey(XmlForeignKey_2_1 value);
+ void setInverseForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToMany_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToMany_2_1.java
index da68267..07e0fa5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToMany_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToMany_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -41,7 +43,7 @@ public interface XmlManyToMany_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -53,7 +55,7 @@ public interface XmlManyToMany_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getMapKeyConverts();
+ EList<XmlConvert> getMapKeyConverts();
/**
* Returns the value of the '<em><b>Map Key Foreign Key</b></em>' containment reference.
@@ -64,12 +66,12 @@ public interface XmlManyToMany_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
- * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setMapKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlManyToMany_2_1_MapKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getMapKeyForeignKey();
+ XmlForeignKey getMapKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlManyToMany_2_1#getMapKeyForeignKey <em>Map Key Foreign Key</em>}' containment reference.
@@ -79,6 +81,6 @@ public interface XmlManyToMany_2_1 extends EBaseObject
* @see #getMapKeyForeignKey()
* @generated
*/
- void setMapKeyForeignKey(XmlForeignKey_2_1 value);
+ void setMapKeyForeignKey(XmlForeignKey value);
} // XmlManyToMany_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToOne_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToOne_2_1.java
index 1ec7aae..f547e8c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToOne_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlManyToOne_2_1.java
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -45,12 +46,12 @@ public interface XmlManyToOne_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlManyToOne_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getForeignKey();
+ XmlForeignKey getForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlManyToOne_2_1#getForeignKey <em>Foreign Key</em>}' containment reference.
@@ -60,6 +61,6 @@ public interface XmlManyToOne_2_1 extends EBaseObject
* @see #getForeignKey()
* @generated
*/
- void setForeignKey(XmlForeignKey_2_1 value);
+ void setForeignKey(XmlForeignKey value);
} // XmlManyToOne_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedEntityGraph_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedEntityGraph_2_1.java
index f47f1b6..bc0cc67 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedEntityGraph_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedEntityGraph_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph;
/**
* <!-- begin-user-doc -->
@@ -44,7 +46,7 @@ public interface XmlNamedEntityGraph_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Attribute Nodes</em>' containment reference list isn't clear,
@@ -56,11 +58,11 @@ public interface XmlNamedEntityGraph_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedAttributeNode_2_1> getNamedAttributeNodes();
+ EList<XmlNamedAttributeNode> getNamedAttributeNodes();
/**
* Returns the value of the '<em><b>Subgraphs</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Subgraphs</em>' containment reference list isn't clear,
@@ -72,11 +74,11 @@ public interface XmlNamedEntityGraph_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedSubgraph_2_1> getSubgraphs();
+ EList<XmlNamedSubgraph> getSubgraphs();
/**
* Returns the value of the '<em><b>Subclass Subgraphs</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedSubgraph_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedSubgraph}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Subclass Subgraphs</em>' containment reference list isn't clear,
@@ -88,7 +90,7 @@ public interface XmlNamedEntityGraph_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedSubgraph_2_1> getSubclassSubgraphs();
+ EList<XmlNamedSubgraph> getSubclassSubgraphs();
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java
index bb40628..d8d6224 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.jpa.core.resource.orm.XmlQuery;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
/**
@@ -36,9 +37,10 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
*
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlNamedStoredProcedureQuery_2_1()
* @model kind="class" interface="true" abstract="true"
+ * @extends EBaseObject
* @generated
*/
-public interface XmlNamedStoredProcedureQuery_2_1 extends XmlQuery
+public interface XmlNamedStoredProcedureQuery_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Result Classes</b></em>' attribute list.
@@ -100,7 +102,7 @@ public interface XmlNamedStoredProcedureQuery_2_1 extends XmlQuery
/**
* Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Parameters</em>' reference list isn't clear,
@@ -112,6 +114,6 @@ public interface XmlNamedStoredProcedureQuery_2_1 extends XmlQuery
* @model containment="true"
* @generated
*/
- EList<XmlStoredProcedureParameter_2_1> getParameters();
+ EList<XmlStoredProcedureParameter> getParameters();
} // XmlNamedStoredProcedureQuery_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedSubgraph_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedSubgraph_2_1.java
index 02f0476..4a5c58d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedSubgraph_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedSubgraph_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode;
/**
* <!-- begin-user-doc -->
@@ -42,7 +43,7 @@ public interface XmlNamedSubgraph_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Named Attribute Nodes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedAttributeNode_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedAttributeNode}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Named Attribute Nodes</em>' containment reference list isn't clear,
@@ -54,7 +55,7 @@ public interface XmlNamedSubgraph_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlNamedAttributeNode_2_1> getNamedAttributeNodes();
+ EList<XmlNamedAttributeNode> getNamedAttributeNodes();
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToMany_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToMany_2_1.java
index c3303e6..fe93abc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToMany_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToMany_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -42,7 +44,7 @@ public interface XmlOneToMany_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -54,7 +56,7 @@ public interface XmlOneToMany_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getMapKeyConverts();
+ EList<XmlConvert> getMapKeyConverts();
/**
* Returns the value of the '<em><b>Map Key Foreign Key</b></em>' containment reference.
@@ -65,12 +67,12 @@ public interface XmlOneToMany_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Map Key Foreign Key</em>' containment reference.
- * @see #setMapKeyForeignKey(XmlForeignKey_2_1)
+ * @see #setMapKeyForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlOneToMany_2_1_MapKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getMapKeyForeignKey();
+ XmlForeignKey getMapKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlOneToMany_2_1#getMapKeyForeignKey <em>Map Key Foreign Key</em>}' containment reference.
@@ -80,7 +82,7 @@ public interface XmlOneToMany_2_1 extends EBaseObject
* @see #getMapKeyForeignKey()
* @generated
*/
- void setMapKeyForeignKey(XmlForeignKey_2_1 value);
+ void setMapKeyForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
@@ -91,12 +93,12 @@ public interface XmlOneToMany_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlOneToMany_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getForeignKey();
+ XmlForeignKey getForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlOneToMany_2_1#getForeignKey <em>Foreign Key</em>}' containment reference.
@@ -106,6 +108,6 @@ public interface XmlOneToMany_2_1 extends EBaseObject
* @see #getForeignKey()
* @generated
*/
- void setForeignKey(XmlForeignKey_2_1 value);
+ void setForeignKey(XmlForeignKey value);
} // XmlOneToMany_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToOne_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToOne_2_1.java
index 2d96754..41ec12a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToOne_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlOneToOne_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
/**
* <!-- begin-user-doc -->
@@ -42,7 +44,7 @@ public interface XmlOneToOne_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Map Key Converts</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvert_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvert}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Map Key Converts</em>' containment reference list isn't clear,
@@ -54,7 +56,7 @@ public interface XmlOneToOne_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlConvert_2_1> getMapKeyConverts();
+ EList<XmlConvert> getMapKeyConverts();
/**
* Returns the value of the '<em><b>Primary Key Foreign Key</b></em>' containment reference.
@@ -65,12 +67,12 @@ public interface XmlOneToOne_2_1 extends EBaseObject
* </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.core.resource.orm.v2_1.OrmV2_1Package#getXmlOneToOne_2_1_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getPrimaryKeyForeignKey();
+ XmlForeignKey getPrimaryKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlOneToOne_2_1#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
@@ -80,7 +82,7 @@ public interface XmlOneToOne_2_1 extends EBaseObject
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- void setPrimaryKeyForeignKey(XmlForeignKey_2_1 value);
+ void setPrimaryKeyForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Foreign Key</b></em>' containment reference.
@@ -91,12 +93,12 @@ public interface XmlOneToOne_2_1 extends EBaseObject
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Foreign Key</em>' containment reference.
- * @see #setForeignKey(XmlForeignKey_2_1)
+ * @see #setForeignKey(XmlForeignKey)
* @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlOneToOne_2_1_ForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getForeignKey();
+ XmlForeignKey getForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlOneToOne_2_1#getForeignKey <em>Foreign Key</em>}' containment reference.
@@ -106,6 +108,6 @@ public interface XmlOneToOne_2_1 extends EBaseObject
* @see #getForeignKey()
* @generated
*/
- void setForeignKey(XmlForeignKey_2_1 value);
+ void setForeignKey(XmlForeignKey value);
} // XmlOneToOne_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSecondaryTable_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSecondaryTable_2_1.java
index c25cfeb..dd47e34 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSecondaryTable_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSecondaryTable_2_1.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlForeignKey;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -48,12 +50,12 @@ public interface XmlSecondaryTable_2_1 extends EBaseObject
* </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.core.resource.orm.v2_1.OrmV2_1Package#getXmlSecondaryTable_2_1_PrimaryKeyForeignKey()
* @model containment="true"
* @generated
*/
- XmlForeignKey_2_1 getPrimaryKeyForeignKey();
+ XmlForeignKey getPrimaryKeyForeignKey();
/**
* Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlSecondaryTable_2_1#getPrimaryKeyForeignKey <em>Primary Key Foreign Key</em>}' containment reference.
@@ -63,11 +65,11 @@ public interface XmlSecondaryTable_2_1 extends EBaseObject
* @see #getPrimaryKeyForeignKey()
* @generated
*/
- void setPrimaryKeyForeignKey(XmlForeignKey_2_1 value);
+ void setPrimaryKeyForeignKey(XmlForeignKey value);
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -79,6 +81,6 @@ public interface XmlSecondaryTable_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlIndex_2_1> getIndexes();
+ EList<XmlIndex> getIndexes();
} // XmlSecondaryTable_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSqlResultSetMapping_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSqlResultSetMapping_2_1.java
index 7c0b8bc..198ac5f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSqlResultSetMapping_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlSqlResultSetMapping_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult;
/**
* <!-- begin-user-doc -->
@@ -40,7 +41,7 @@ public interface XmlSqlResultSetMapping_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Constructor Results</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ConstructorResult_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.ConstructorResult}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Constructor Results</em>' containment reference list isn't clear,
@@ -52,6 +53,6 @@ public interface XmlSqlResultSetMapping_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<ConstructorResult_2_1> getConstructorResults();
+ EList<ConstructorResult> getConstructorResults();
} // XmlSqlResultSetMapping_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTableGenerator_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTableGenerator_2_1.java
index f795c05..19074ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTableGenerator_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTableGenerator_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -40,7 +41,7 @@ public interface XmlTableGenerator_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -52,6 +53,6 @@ public interface XmlTableGenerator_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlIndex_2_1> getIndexes();
+ EList<XmlIndex> getIndexes();
} // XmlTableGenerator_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTable_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTable_2_1.java
index a4a9728..154a134 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTable_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlTable_2_1.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jpt.common.core.resource.xml.EBaseObject;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlIndex;
/**
* <!-- begin-user-doc -->
@@ -40,7 +41,7 @@ public interface XmlTable_2_1 extends EBaseObject
{
/**
* Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlIndex_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlIndex}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Indexes</em>' containment reference list isn't clear,
@@ -52,6 +53,6 @@ public interface XmlTable_2_1 extends EBaseObject
* @model containment="true"
* @generated
*/
- EList<XmlIndex_2_1> getIndexes();
+ EList<XmlIndex> getIndexes();
} // XmlTable_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java
index f989fd8..ee6655a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/persistence/PersistencePackage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle.
+ * Copyright (c) 2009, 2013 Oracle.
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -178,6 +178,15 @@ public class PersistencePackage extends EPackageImpl
public static final int XML_PERSISTENCE__VERSION = CommonPackage.EROOT_OBJECT_IMPL__VERSION;
/**
+ * The feature id for the '<em><b>Namespace</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_PERSISTENCE__NAMESPACE = CommonPackage.EROOT_OBJECT_IMPL__NAMESPACE;
+
+ /**
* The feature id for the '<em><b>Schema Location</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
index 7406045..cb35075 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
@@ -68,6 +68,7 @@ import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.EntityMappings2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmConverterType2_1;
import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable;
import org.eclipse.jpt.jpa.core.resource.orm.XmlEntity;
import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
@@ -76,7 +77,6 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass;
import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator;
import org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator;
import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages;
import org.eclipse.jpt.jpa.db.Catalog;
import org.eclipse.jpt.jpa.db.Database;
@@ -900,7 +900,7 @@ public abstract class AbstractEntityMappings
return managedTypes;
}
- protected List<XmlConverter_2_1> getXml2_1Converters() {
+ protected List<XmlConverter> getXml2_1Converters() {
return this.xmlEntityMappings.getConverters();
}
@@ -1142,11 +1142,11 @@ public abstract class AbstractEntityMappings
return (OrmConverterType2_1) this.addManagedType(this.buildXmlConverter(), className);
}
- protected XmlConverter_2_1 buildXmlConverter() {
+ protected XmlConverter buildXmlConverter() {
return EmfTools.create(
this.getResourceNodeFactory(),
OrmPackage.eINSTANCE.getXmlConverter(),
- XmlConverter_2_1.class);
+ XmlConverter.class);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType.java
index 1afbfd2..9743d0c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType.java
@@ -14,8 +14,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaManagedType;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManagedType;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.EntityMappings2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmConverterType2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
public class GenericOrmConverterType extends AbstractOrmManagedType
implements OrmConverterType2_1
@@ -24,7 +24,7 @@ public class GenericOrmConverterType extends AbstractOrmManagedType
protected Boolean specifiedAutoApply;
- public GenericOrmConverterType(EntityMappings2_1 parent, XmlConverter_2_1 xmlConverter) {
+ public GenericOrmConverterType(EntityMappings2_1 parent, XmlConverter xmlConverter) {
super(parent, xmlConverter);
this.specifiedAutoApply = this.buildSpecifiedAutoApply();
this.autoApply = this.buildAutoApply();
@@ -43,11 +43,11 @@ public class GenericOrmConverterType extends AbstractOrmManagedType
}
@Override
- public XmlConverter_2_1 getXmlManagedType() {
- return (XmlConverter_2_1) super.getXmlManagedType();
+ public XmlConverter getXmlManagedType() {
+ return (XmlConverter) super.getXmlManagedType();
}
- public XmlConverter_2_1 getXmlConverter() {
+ public XmlConverter getXmlConverter() {
return this.getXmlManagedType();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmXml2_1ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmXml2_1ContextNodeFactory.java
index 57b966f..08e285d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmXml2_1ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmXml2_1ContextNodeFactory.java
@@ -13,14 +13,14 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Contex
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.EntityMappings2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmConverterType2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmXml2_1ContextNodeFactory;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
public class GenericOrmXml2_1ContextNodeFactory
extends GenericOrmXml2_0ContextNodeFactory
implements OrmXml2_1ContextNodeFactory
{
- public OrmConverterType2_1 buildOrmConverter(EntityMappings2_1 parent, XmlConverter_2_1 xmlConverter) {
+ public OrmConverterType2_1 buildOrmConverter(EntityMappings2_1 parent, XmlConverter xmlConverter) {
return new GenericOrmConverterType(parent, xmlConverter);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/OrmConverterTypeDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/OrmConverterTypeDefinition.java
index bb22d0a..71e0731 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/OrmConverterTypeDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/OrmConverterTypeDefinition.java
@@ -16,8 +16,8 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.EntityMappings2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmConverterType2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmXml2_1ContextNodeFactory;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
public class OrmConverterTypeDefinition
implements OrmManagedTypeDefinition
@@ -44,10 +44,10 @@ public class OrmConverterTypeDefinition
}
public Class<? extends XmlManagedType> getResourceType() {
- return XmlConverter_2_1.class;
+ return XmlConverter.class;
}
public OrmManagedType buildContextManagedType(JpaContextNode parent, XmlManagedType resourceManagedType, OrmXmlContextNodeFactory factory) {
- return ((OrmXml2_1ContextNodeFactory) factory).buildOrmConverter((EntityMappings2_1) parent, (XmlConverter_2_1) resourceManagedType);
+ return ((OrmXml2_1ContextNodeFactory) factory).buildOrmConverter((EntityMappings2_1) parent, (XmlConverter) resourceManagedType);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmConverterType2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmConverterType2_1.java
index 118d228..31c3002 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmConverterType2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmConverterType2_1.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.jpa2_1.context.orm;
import org.eclipse.jpt.jpa.core.context.orm.OrmManagedType;
import org.eclipse.jpt.jpa.core.jpa2_1.context.ConverterType2_1;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
/**
* Context converter type.
@@ -31,7 +31,7 @@ public interface OrmConverterType2_1
Class<? extends OrmConverterType2_1> getType();
- XmlConverter_2_1 getXmlConverter();
+ XmlConverter getXmlConverter();
- XmlConverter_2_1 getXmlManagedType();
+ XmlConverter getXmlManagedType();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmXml2_1ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmXml2_1ContextNodeFactory.java
index db67db8..45d8a98 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmXml2_1ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/orm/OrmXml2_1ContextNodeFactory.java
@@ -10,7 +10,7 @@
package org.eclipse.jpt.jpa.core.jpa2_1.context.orm;
import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
/**
* JPA 2.1 <code>orm.xml</code> context node factory
@@ -27,5 +27,5 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
public interface OrmXml2_1ContextNodeFactory
extends OrmXmlContextNodeFactory
{
- OrmConverterType2_1 buildOrmConverter(EntityMappings2_1 parent, XmlConverter_2_1 xmlConverter);
+ OrmConverterType2_1 buildOrmConverter(EntityMappings2_1 parent, XmlConverter xmlConverter);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index a76b857..9b842ec 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -2962,6 +2962,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ENTITY_MAPPINGS__VERSION = OrmPackage.XML_ENTITY_MAPPINGS__VERSION;
/**
+ * The feature id for the '<em><b>Namespace</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_MAPPINGS__NAMESPACE = OrmPackage.XML_ENTITY_MAPPINGS__NAMESPACE;
+ /**
* The feature id for the '<em><b>Schema Location</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java
index 3764e50..e372195 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java
@@ -29,6 +29,8 @@ import org.eclipse.jpt.jpa.core.resource.orm.JPA;
import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
import org.eclipse.jpt.jpa.core.resource.orm.TemporalType;
import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConvert;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
@@ -103,7 +105,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -143,7 +145,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
* @generated
* @ordered
*/
- protected XmlConvert_2_1 convert;
+ protected XmlConvert convert;
/**
* The default value of the '{@link #isLob() <em>Lob</em>}' attribute.
@@ -353,7 +355,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -365,11 +367,11 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_ARRAY__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ARRAY__CONVERTERS);
}
return converters;
}
@@ -452,12 +454,12 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Convert</em>' containment reference.
- * @see #setConvert(XmlConvert_2_1)
+ * @see #setConvert(XmlConvert)
* @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_2_1_Convert()
* @model containment="true"
* @generated
*/
- public XmlConvert_2_1 getConvert()
+ public XmlConvert getConvert()
{
return convert;
}
@@ -467,9 +469,9 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetConvert(XmlConvert_2_1 newConvert, NotificationChain msgs)
+ public NotificationChain basicSetConvert(XmlConvert newConvert, NotificationChain msgs)
{
- XmlConvert_2_1 oldConvert = convert;
+ XmlConvert oldConvert = convert;
convert = newConvert;
if (eNotificationRequired())
{
@@ -487,7 +489,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
* @see #getConvert()
* @generated
*/
- public void setConvert(XmlConvert_2_1 newConvert)
+ public void setConvert(XmlConvert newConvert)
{
if (newConvert != convert)
{
@@ -874,7 +876,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
return;
case EclipseLinkOrmPackage.XML_ARRAY__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_ARRAY__TYPE_CONVERTERS:
getTypeConverters().clear();
@@ -889,7 +891,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_ARRAY__CONVERT:
- setConvert((XmlConvert_2_1)newValue);
+ setConvert((XmlConvert)newValue);
return;
case EclipseLinkOrmPackage.XML_ARRAY__LOB:
setLob((Boolean)newValue);
@@ -945,7 +947,7 @@ public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttribut
getStructConverters().clear();
return;
case EclipseLinkOrmPackage.XML_ARRAY__CONVERT:
- setConvert((XmlConvert_2_1)null);
+ setConvert((XmlConvert)null);
return;
case EclipseLinkOrmPackage.XML_ARRAY__LOB:
setLob(LOB_EDEFAULT);
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 b35388f..a93523d 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
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue;
import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator;
@@ -227,7 +228,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -314,7 +315,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -326,11 +327,11 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_BASIC__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_BASIC__CONVERTERS);
}
return converters;
}
@@ -1180,7 +1181,7 @@ public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic imp
return;
case EclipseLinkOrmPackage.XML_BASIC__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTERS:
getTypeConverters().clear();
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 426ec37..4097a38 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
@@ -27,6 +27,7 @@ import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.resource.orm.CascadeType;
import org.eclipse.jpt.jpa.core.resource.orm.JPA;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
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;
@@ -142,7 +143,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -1367,7 +1368,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -1379,11 +1380,11 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS);
}
return converters;
}
@@ -1594,7 +1595,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS:
getTypeConverters().clear();
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 f257e61..dcea4d6 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2012 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.
@@ -30,6 +30,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer;
import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1;
import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
@@ -198,7 +199,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -740,7 +741,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -752,11 +753,11 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS);
}
return converters;
}
@@ -1215,7 +1216,7 @@ public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbe
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS:
getTypeConverters().clear();
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 8f1c6f8..cb87f6f 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
@@ -27,6 +27,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.CascadeType;
import org.eclipse.jpt.jpa.core.resource.orm.JPA;
import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
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;
@@ -500,7 +501,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -879,7 +880,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -891,11 +892,11 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS);
}
return converters;
}
@@ -3023,7 +3024,7 @@ public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity i
return;
case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS:
getTypeConverters().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 ebde5d8..e54487d 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
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
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;
@@ -173,7 +174,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -538,7 +539,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -550,11 +551,11 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_ID__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ID__CONVERTERS);
}
return converters;
}
@@ -821,7 +822,7 @@ public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implement
return;
case EclipseLinkOrmPackage.XML_ID__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTERS:
getTypeConverters().clear();
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 abb9e2d..73ff77f 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
@@ -27,6 +27,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.CascadeType;
import org.eclipse.jpt.jpa.core.resource.orm.JPA;
import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
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;
@@ -100,7 +101,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -432,7 +433,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -444,11 +445,11 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTERS);
}
return converters;
}
@@ -1431,7 +1432,7 @@ public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlMany
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTERS:
getTypeConverters().clear();
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 975a0c4..95ae797 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
@@ -29,6 +29,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer;
import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery;
import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
@@ -550,7 +551,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -929,7 +930,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -941,11 +942,11 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS);
}
return converters;
}
@@ -3125,7 +3126,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS:
getTypeConverters().clear();
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 8fee3c7..b4fa7b2 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
@@ -27,6 +27,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.CascadeType;
import org.eclipse.jpt.jpa.core.resource.orm.JPA;
import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
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;
@@ -99,7 +100,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -506,7 +507,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -518,11 +519,11 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTERS);
}
return converters;
}
@@ -1544,7 +1545,7 @@ public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneTo
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTERS:
getTypeConverters().clear();
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 05abf29..72d3a71 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
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
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;
@@ -134,7 +135,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
* @generated
* @ordered
*/
- protected EList<XmlConverter_2_1> converters;
+ protected EList<XmlConverter> converters;
/**
* The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
@@ -319,7 +320,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
/**
* Returns the value of the '<em><b>Converters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}.
+ * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Converters</em>' containment reference list isn't clear,
@@ -331,11 +332,11 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
* @model containment="true"
* @generated
*/
- public EList<XmlConverter_2_1> getConverters()
+ public EList<XmlConverter> getConverters()
{
if (converters == null)
{
- converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_VERSION__CONVERTERS);
+ converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_VERSION__CONVERTERS);
}
return converters;
}
@@ -581,7 +582,7 @@ public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion
return;
case EclipseLinkOrmPackage.XML_VERSION__CONVERTERS:
getConverters().clear();
- getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue);
+ getConverters().addAll((Collection<? extends XmlConverter>)newValue);
return;
case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTERS:
getTypeConverters().clear();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkConverterContainerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkConverterContainerImpl.java
index 6c02fa5..cc8a700 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkConverterContainerImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkConverterContainerImpl.java
@@ -18,7 +18,6 @@ import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.jpa.core.context.JpaContextNode;
import org.eclipse.jpt.jpa.core.context.TypeRefactoringParticipant;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter;
@@ -43,7 +42,7 @@ public abstract class AbstractOrmEclipseLinkConverterContainerImpl
private final Owner owner;
protected final XmlConverterContainer xmlConverterContainer;
- protected final ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter_2_1> customConverterContainer;
+ protected final ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter> customConverterContainer;
protected final ContextListContainer<OrmEclipseLinkObjectTypeConverter, XmlObjectTypeConverter> objectTypeConverterContainer;
protected final ContextListContainer<OrmEclipseLinkStructConverter, XmlStructConverter> structConverterContainer;
protected final ContextListContainer<OrmEclipseLinkTypeConverter, XmlTypeConverter> typeConverterContainer;
@@ -131,16 +130,16 @@ public abstract class AbstractOrmEclipseLinkConverterContainerImpl
this.customConverterContainer.synchronizeWithResourceModel();
}
- protected ListIterable<XmlConverter_2_1> getXmlCustomConverters() {
+ protected ListIterable<XmlConverter> getXmlCustomConverters() {
// clone to reduce chance of concurrency problems
- return IterableTools.cloneLive(this.getNamedXmlConverters());
+ return IterableTools.downCast(IterableTools.cloneLive(this.getXmlConverters()));
}
- protected List<XmlConverter_2_1> getNamedXmlConverters() {
+ protected List<org.eclipse.jpt.jpa.core.resource.orm.XmlConverter> getXmlConverters() {
return this.xmlConverterContainer.getConverters();
}
- protected ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter_2_1> buildCustomConverterContainer() {
+ protected ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter> buildCustomConverterContainer() {
CustomConverterContainer container = new CustomConverterContainer();
container.initialize();
return container;
@@ -150,22 +149,22 @@ public abstract class AbstractOrmEclipseLinkConverterContainerImpl
* custom converter container
*/
protected class CustomConverterContainer
- extends ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter_2_1>
+ extends ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter>
{
@Override
protected String getContextElementsPropertyName() {
return CUSTOM_CONVERTERS_LIST;
}
@Override
- protected OrmEclipseLinkCustomConverter buildContextElement(XmlConverter_2_1 resourceElement) {
- return AbstractOrmEclipseLinkConverterContainerImpl.this.buildCustomConverter((XmlConverter) resourceElement);
+ protected OrmEclipseLinkCustomConverter buildContextElement(XmlConverter resourceElement) {
+ return AbstractOrmEclipseLinkConverterContainerImpl.this.buildCustomConverter(resourceElement);
}
@Override
- protected ListIterable<XmlConverter_2_1> getResourceElements() {
+ protected ListIterable<XmlConverter> getResourceElements() {
return AbstractOrmEclipseLinkConverterContainerImpl.this.getXmlCustomConverters();
}
@Override
- protected XmlConverter_2_1 getResourceElement(OrmEclipseLinkCustomConverter contextElement) {
+ protected XmlConverter getResourceElement(OrmEclipseLinkCustomConverter contextElement) {
return contextElement.getXmlConverter();
}
}
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 be8c0c6..c572a70 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
@@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn;
import org.eclipse.jpt.jpa.core.context.orm.OrmXml;
import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractEntityMappings;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.db.Table;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
@@ -135,9 +135,9 @@ public class EclipseLinkEntityMappingsImpl
// ********** managed types **********
@Override
- protected List<XmlConverter_2_1> getXml2_1Converters() {
- ArrayList<XmlConverter_2_1> xmlConverters = new ArrayList<XmlConverter_2_1>();
- for (XmlConverter_2_1 xmlConverter : this.xmlEntityMappings.getConverters()) {
+ protected List<XmlConverter> getXml2_1Converters() {
+ ArrayList<XmlConverter> xmlConverters = new ArrayList<XmlConverter>();
+ for (XmlConverter xmlConverter : this.xmlEntityMappings.getConverters()) {
if (((XmlNamedConverter) xmlConverter).getName() == null){
xmlConverters.add(xmlConverter);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_5ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_5ContextNodeFactory.java
index df7cf82..d5d0669 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_5ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_5ContextNodeFactory.java
@@ -13,13 +13,13 @@ import org.eclipse.jpt.jpa.core.internal.jpa2_1.context.orm.GenericOrmConverterT
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.EntityMappings2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmConverterType2_1;
import org.eclipse.jpt.jpa.core.jpa2_1.context.orm.OrmXml2_1ContextNodeFactory;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
public class EclipseLinkOrmXml2_5ContextNodeFactory
extends EclipseLinkOrmXml2_4ContextNodeFactory
implements OrmXml2_1ContextNodeFactory
{
- public OrmConverterType2_1 buildOrmConverter(EntityMappings2_1 parent, XmlConverter_2_1 xmlConverter) {
+ public OrmConverterType2_1 buildOrmConverter(EntityMappings2_1 parent, XmlConverter xmlConverter) {
return new GenericOrmConverterType(parent, xmlConverter);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityMappingsConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityMappingsConverterContainer.java
index 521009e..747f8bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityMappingsConverterContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityMappingsConverterContainer.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlConverter;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterContainer;
import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
@@ -29,10 +29,10 @@ public final class OrmEclipseLinkEntityMappingsConverterContainer
* JPA 2.1 converters
*/
@Override
- protected List<XmlConverter_2_1> getNamedXmlConverters() {
+ protected List<XmlConverter> getXmlConverters() {
if (this.isJpa2_1Compatible()) {
- ArrayList<XmlConverter_2_1> xmlConverters = new ArrayList<XmlConverter_2_1>();
- for (XmlConverter_2_1 xmlConverter : this.xmlConverterContainer.getConverters()) {
+ ArrayList<XmlConverter> xmlConverters = new ArrayList<XmlConverter>();
+ for (XmlConverter xmlConverter : this.xmlConverterContainer.getConverters()) {
if (((XmlNamedConverter) xmlConverter).getName() != null){
xmlConverters.add(xmlConverter);
}
@@ -40,6 +40,6 @@ public final class OrmEclipseLinkEntityMappingsConverterContainer
return xmlConverters;
}
- return super.getNamedXmlConverters();
+ return super.getXmlConverters();
}
}