diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java')
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java | 36 |
1 files changed, 27 insertions, 9 deletions
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 255ad31388..692c78d771 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 @@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; @@ -27,6 +28,9 @@ 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.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.XmlColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0; @@ -158,7 +162,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm. * @generated * @ordered */ - protected EList<XmlConverter> converters; + protected EList<XmlConverter_2_1> converters; /** * The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list. @@ -1473,7 +1477,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.eclipselink.core.resource.orm.XmlConverter}. + * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Converters</em>' containment reference list isn't clear, @@ -1481,15 +1485,15 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm. * </p> * <!-- end-user-doc --> * @return the value of the '<em>Converters</em>' containment reference list. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterContainer_Converters() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterContainer_2_1_Converters() * @model containment="true" * @generated */ - public EList<XmlConverter> getConverters() + public EList<XmlConverter_2_1> getConverters() { if (converters == null) { - converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS); + converters = new EObjectContainmentEList<XmlConverter_2_1>(XmlConverter_2_1.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS); } return converters; } @@ -1707,7 +1711,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>)newValue); + getConverters().addAll((Collection<? extends XmlConverter_2_1>)newValue); return; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS: getTypeConverters().clear(); @@ -1982,11 +1986,18 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm. default: return -1; } } + if (baseClass == XmlConverterContainer_2_1.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS: return OrmV2_1Package.XML_CONVERTER_CONTAINER_21__CONVERTERS; + default: return -1; + } + } if (baseClass == XmlConverterContainer.class) { switch (derivedFeatureID) { - case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__CONVERTERS; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__TYPE_CONVERTERS; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__OBJECT_TYPE_CONVERTERS; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__STRUCT_CONVERTERS; @@ -2124,11 +2135,18 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm. default: return -1; } } + if (baseClass == XmlConverterContainer_2_1.class) + { + switch (baseFeatureID) + { + case OrmV2_1Package.XML_CONVERTER_CONTAINER_21__CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS; + default: return -1; + } + } if (baseClass == XmlConverterContainer.class) { switch (baseFeatureID) { - case EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS; case EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS; case EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS; case EclipseLinkOrmPackage.XML_CONVERTER_CONTAINER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS; @@ -2318,7 +2336,7 @@ public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm. buildConvertTranslator(), buildAttributeOverrideTranslator(), buildAssociationOverrideTranslator(), - XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_Converters()), + XmlConverter.buildTranslator(EclipseLink.CONVERTER, OrmV2_1Package.eINSTANCE.getXmlConverterContainer_2_1_Converters()), XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_TypeConverters()), XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_ObjectTypeConverters()), XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_StructConverters()), |