diff options
6 files changed, 21 insertions, 19 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 a9c271509c..9454972a43 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/orm.ecore @@ -762,7 +762,7 @@ <eClassifiers xsi:type="ecore:EClass" name="XmlQueryContainer_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="namedStoredProcedureQueries"
- upperBound="-1" eType="#//v2_1/XmlNamedStoredProcedureQuery_2_1" containment="true"
+ upperBound="-1" eType="#//XmlNamedStoredProcedureQuery" containment="true"
resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable_2_1" abstract="true"
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 95c060a216..1a418d3fa7 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 @@ -80,7 +80,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain * @generated * @ordered */ - protected EList<XmlNamedStoredProcedureQuery_2_1> namedStoredProcedureQueries; + protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries; /** * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list. @@ -453,7 +453,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain /** * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1}. + * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear, @@ -465,11 +465,11 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain * @model containment="true" * @generated */ - public EList<XmlNamedStoredProcedureQuery_2_1> getNamedStoredProcedureQueries() + public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries() { if (namedStoredProcedureQueries == null) { - namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery_2_1>(XmlNamedStoredProcedureQuery_2_1.class, this, OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES); + namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES); } return namedStoredProcedureQueries; } @@ -1907,7 +1907,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain { case OrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES: getNamedStoredProcedureQueries().clear(); - getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery_2_1>)newValue); + getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue); return; case OrmPackage.XML_ENTITY__NAMED_QUERIES: getNamedQueries().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 fb52785657..7ce5ed6163 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 @@ -82,7 +82,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai * @generated * @ordered */ - protected EList<XmlNamedStoredProcedureQuery_2_1> namedStoredProcedureQueries; + protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries; /** * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list. @@ -307,7 +307,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai /** * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1}. + * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear, @@ -319,11 +319,11 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai * @model containment="true" * @generated */ - public EList<XmlNamedStoredProcedureQuery_2_1> getNamedStoredProcedureQueries() + public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries() { if (namedStoredProcedureQueries == null) { - namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery_2_1>(XmlNamedStoredProcedureQuery_2_1.class, this, OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES); + namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES); } return namedStoredProcedureQueries; } @@ -865,7 +865,7 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai { case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES: getNamedStoredProcedureQueries().clear(); - getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery_2_1>)newValue); + getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue); return; case OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES: getNamedQueries().clear(); 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 aee2d764a0..f1bdc2efaa 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 @@ -3290,7 +3290,7 @@ public class OrmV2_1Package extends EPackageImpl 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); initEClass(xmlQueryContainer_2_1EClass, XmlQueryContainer_2_1.class, "XmlQueryContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlQueryContainer_2_1_NamedStoredProcedureQueries(), this.getXmlNamedStoredProcedureQuery_2_1(), 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); + 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); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlQueryContainer_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlQueryContainer_2_1.java index 19e94feebb..0cacd2424b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlQueryContainer_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlQueryContainer_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.XmlNamedStoredProcedureQuery; /** * <!-- begin-user-doc --> @@ -40,7 +41,7 @@ public interface XmlQueryContainer_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1}. + * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear, @@ -52,6 +53,6 @@ public interface XmlQueryContainer_2_1 extends EBaseObject * @model containment="true" * @generated */ - EList<XmlNamedStoredProcedureQuery_2_1> getNamedStoredProcedureQueries(); + EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries(); } // XmlQueryContainer_2_1 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 e909a51ede..975a0c452a 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 @@ -32,6 +32,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference; 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; +import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery; import org.eclipse.jpt.jpa.core.resource.orm.XmlQueryContainer; import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator; import org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator; @@ -243,7 +244,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X * @generated * @ordered */ - protected EList<XmlNamedStoredProcedureQuery_2_1> namedStoredProcedureQueries; + protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries; /** * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list. @@ -1673,7 +1674,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X /** * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlNamedStoredProcedureQuery_2_1}. + * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedStoredProcedureQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear, @@ -1685,11 +1686,11 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X * @model containment="true" * @generated */ - public EList<XmlNamedStoredProcedureQuery_2_1> getNamedStoredProcedureQueries() + public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries() { if (namedStoredProcedureQueries == null) { - namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery_2_1>(XmlNamedStoredProcedureQuery_2_1.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES); + namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES); } return namedStoredProcedureQueries; } @@ -3031,7 +3032,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.X return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: getNamedStoredProcedureQueries().clear(); - getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery_2_1>)newValue); + getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue); return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES: getNamedQueries().clear(); |