Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa
diff options
context:
space:
mode:
authorkmoore2010-05-12 17:05:34 +0000
committerkmoore2010-05-12 17:05:34 +0000
commitf345e075a96c99b2a2f74f1e6885a1e1aaf6b480 (patch)
tree1ca41e4bcb2ddb6501f3c7ac50ff5df507b1a1e8 /jpa
parent56e01d0dca257b9b5b6785f20f85ad0c8f30fd6e (diff)
downloadwebtools.dali-f345e075a96c99b2a2f74f1e6885a1e1aaf6b480.tar.gz
webtools.dali-f345e075a96c99b2a2f74f1e6885a1e1aaf6b480.tar.xz
webtools.dali-f345e075a96c99b2a2f74f1e6885a1e1aaf6b480.zip
309236 - update eclipselink orm.xml resource model to match recent 2.1 changes
Diffstat (limited to 'jpa')
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel3
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore3
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd9
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd97
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java90
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java76
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java76
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java74
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java112
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java27
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java27
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java27
13 files changed, 580 insertions, 43 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 5d8b811d9a..c1b1ae0b25 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -333,6 +333,7 @@
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntity_2_1">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlEntity_2_1/classExtractor"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlEntity_2_1/parentClass"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlEntityMappings_2_1"/>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchAttribute_2_1">
@@ -340,6 +341,7 @@
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/load"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlFetchGroup_2_1/attributes"/>
</genClasses>
<genClasses ecoreClass="eclipselink_orm.ecore#//v2_1/XmlFetchGroupContainer_2_1">
@@ -355,6 +357,7 @@
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/sqlResultSetMappings"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/queryRedirectors"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlMappedSuperclass_2_1/parentClass"/>
</genClasses>
<genClasses image="false" ecoreClass="eclipselink_orm.ecore#//v2_1/XmlOneToMany_2_1">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eclipselink_orm.ecore#//v2_1/XmlOneToMany_2_1/attributeType"/>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
index 4cee47290d..abbca3a33b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
@@ -394,6 +394,7 @@
eSuperTypes="#//XmlAccessMethodsHolder #//v2_1/XmlFetchGroupContainer_2_1">
<eStructuralFeatures xsi:type="ecore:EReference" name="classExtractor" eType="ecore:EClass ../../org.eclipse.jpt.core/model/orm.ecore#//XmlClassReference"
containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings_2_1" abstract="true"
interface="true" eSuperTypes="#//XmlAccessMethodsHolder"/>
@@ -404,6 +405,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlFetchGroup_2_1" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="load" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
eType="#//XmlFetchAttribute" containment="true" resolveProxies="false"/>
</eClassifiers>
@@ -428,6 +430,7 @@
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="queryRedirectors" eType="#//XmlQueryRedirectors"
containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_1" abstract="true"
interface="true" eSuperTypes="#//XmlBatchFetchHolder">
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd
index a5e8c69aa3..5e3ce57249 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_orm_2_1.xsd
@@ -773,6 +773,7 @@
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string"/>
<xsd:attribute name="class" type="xsd:string" use="required"/>
+ <xsd:attribute name="parent-class" type="xsd:string"/>
<xsd:attribute name="access" type="orm:access-type"/>
<xsd:attribute name="cacheable" type="xsd:boolean"/>
<xsd:attribute name="metadata-complete" type="xsd:boolean"/>
@@ -1827,6 +1828,12 @@
String name();
/**
+ * (Optional) Indicates whether all relationship attributes
+ * specified in the fetch group should be loaded.
+ */
+ boolean load() default true;
+
+ /**
* (Required) The list of attributes to fetch.
*/
FetchAttribute[] attributes();
@@ -1838,6 +1845,7 @@
<xsd:element name="attribute" type="orm:fetch-attribute" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="load" type="xsd:boolean"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -2558,6 +2566,7 @@
<xsd:element name="attributes" type="orm:attributes" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="class" type="xsd:string" use="required"/>
+ <xsd:attribute name="parent-class" type="xsd:string"/>
<xsd:attribute name="access" type="orm:access-type"/>
<xsd:attribute name="cacheable" type="xsd:boolean"/>
<xsd:attribute name="metadata-complete" type="xsd:boolean"/>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
index 4c15860d31..270f5c66ab 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
@@ -98,6 +98,11 @@
<xs:complexType name="java-attribute" abstract="true">
<xs:attribute name="java-attribute" type="xs:string" />
</xs:complexType>
+ <xs:element name="xml-access-methods" type="xml-access-methods" />
+ <xs:complexType name="xml-access-methods">
+ <xs:attribute name="get-method" type="xs:string" use="required"/>
+ <xs:attribute name="set-method" type="xs:string" use="required"/>
+ </xs:complexType>
<!-- Enums -->
<xs:simpleType name="xml-access-order">
@@ -121,6 +126,13 @@
<xs:enumeration value="UNSET" />
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="xml-marshal-null-representation">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="XSI_NIL" />
+ <xs:enumeration value="ABSENT_NODE" />
+ <xs:enumeration value="EMPTY_NODE" />
+ </xs:restriction>
+ </xs:simpleType>
<!-- @Target(value=PACKAGE) -->
<xs:element name="xml-schema">
@@ -198,6 +210,8 @@
<xs:complexType>
<xs:attribute name="name" type="xs:string" default="##default" />
<xs:attribute name="namespace" type="xs:string" default="##default" />
+ <xs:attribute name="factory-class" type="xs:string" default="javax.xml.bind.annotation.XmlType.DEFAULT" />
+ <xs:attribute name="factory-method" type="xs:string" />
<xs:attribute name="prop-order">
<xs:simpleType>
<xs:list itemType="xs:string" />
@@ -227,12 +241,19 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
-
+
<!-- @Target(value={FIELD,METHOD}) -->
<xs:element name="xml-any-attribute" substitutionGroup="java-attribute">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="java-attribute" />
+ <xs:extension base="java-attribute">
+ <xs:all>
+ <xs:element ref="xml-access-methods" minOccurs="0" />
+ </xs:all>
+ <xs:attribute name="read-only" type="xs:boolean" default="false" />
+ <xs:attribute name="write-only" type="xs:boolean" default="false" />
+ <xs:attribute name="xml-path" type="xs:string" />
+ </xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -241,6 +262,8 @@
<xs:complexContent>
<xs:extension base="java-attribute">
<xs:all>
+ <xs:element ref="xml-abstract-null-policy" minOccurs="0" />
+ <xs:element ref="xml-access-methods" minOccurs="0" />
<xs:element ref="xml-java-type-adapter" minOccurs="0"/>
<xs:element ref="xml-schema-type" minOccurs="0"/>
</xs:all>
@@ -253,6 +276,9 @@
<xs:attribute name="xml-inline-binary-data" type="xs:boolean" default="false" />
<xs:attribute name="xml-attachment-ref" type="xs:boolean" default="false" />
<xs:attribute name="xml-mime-type" type="xs:string" />
+ <xs:attribute name="read-only" type="xs:boolean" default="false" />
+ <xs:attribute name="write-only" type="xs:boolean" default="false" />
+ <xs:attribute name="xml-path" type="xs:string" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -262,11 +288,15 @@
<xs:complexContent>
<xs:extension base="java-attribute">
<xs:all>
+ <xs:element ref="xml-access-methods" minOccurs="0" />
<xs:element ref="xml-java-type-adapter" minOccurs="0"/>
</xs:all>
<xs:attribute name="xml-mixed" type="xs:boolean" default="false" />
<xs:attribute name="lax" type="xs:boolean" default="false" />
<xs:attribute name="dom-handler" type="xs:string" default="javax.xml.bind.annotation.W3CDomHandler" />
+ <xs:attribute name="read-only" type="xs:boolean" default="false" />
+ <xs:attribute name="write-only" type="xs:boolean" default="false" />
+ <xs:attribute name="xml-path" type="xs:string" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -276,6 +306,8 @@
<xs:complexContent>
<xs:extension base="java-attribute">
<xs:all>
+ <xs:element ref="xml-abstract-null-policy" minOccurs="0" />
+ <xs:element ref="xml-access-methods" minOccurs="0" />
<xs:element ref="xml-element-wrapper" minOccurs="0"/>
<xs:element ref="xml-java-type-adapter" minOccurs="0"/>
<xs:element ref="xml-map" minOccurs="0"/>
@@ -293,6 +325,10 @@
<xs:attribute name="xml-inline-binary-data" type="xs:boolean" default="false" />
<xs:attribute name="xml-attachment-ref" type="xs:boolean" default="false" />
<xs:attribute name="xml-mime-type" type="xs:string" />
+ <xs:attribute name="read-only" type="xs:boolean" default="false" />
+ <xs:attribute name="write-only" type="xs:boolean" default="false" />
+ <xs:attribute name="cdata" type="xs:boolean" default="false" />
+ <xs:attribute name="xml-path" type="xs:string" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -302,11 +338,14 @@
<xs:complexContent>
<xs:extension base="java-attribute">
<xs:sequence>
+ <xs:element ref="xml-access-methods" minOccurs="0" />
<xs:element ref="xml-element" maxOccurs="unbounded" minOccurs="0"/>
<xs:element ref="xml-element-wrapper" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="xml-idref" type="xs:boolean" default="false" />
<xs:attribute name="xml-list" type="xs:boolean" default="false" />
+ <xs:attribute name="read-only" type="xs:boolean" default="false" />
+ <xs:attribute name="write-only" type="xs:boolean" default="false" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -337,6 +376,18 @@
</xs:complexContent>
</xs:complexType>
</xs:element>
+ <xs:element name="xml-inverse-reference" substitutionGroup="java-attribute">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="java-attribute">
+ <xs:all>
+ <xs:element ref="xml-access-methods" minOccurs="0" />
+ </xs:all>
+ <xs:attribute name="mapped-by" type="xs:string" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
<xs:element name="xml-element-wrapper">
<xs:complexType>
<xs:attribute name="name" type="xs:string" default="##default" />
@@ -348,7 +399,15 @@
<xs:element name="xml-value" substitutionGroup="java-attribute">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="java-attribute" />
+ <xs:extension base="java-attribute">
+ <xs:sequence>
+ <xs:element ref="xml-abstract-null-policy" minOccurs="0" />
+ <xs:element ref="xml-access-methods" minOccurs="0" />
+ </xs:sequence>
+ <xs:attribute name="read-only" type="xs:boolean" default="false" />
+ <xs:attribute name="write-only" type="xs:boolean" default="false" />
+ <xs:attribute name="cdata" type="xs:boolean" default="false" />
+ </xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
@@ -368,4 +427,36 @@
</xs:all>
</xs:complexType>
</xs:element>
+ <xs:element name="xml-abstract-null-policy" type="xml-abstract-null-policy" />
+ <xs:complexType name="xml-abstract-null-policy" abstract="true">
+ <xs:attribute name="xsi-nil-represents-null" type="xs:boolean" default="false" />
+ <xs:attribute name="empty-node-represents-null" type="xs:boolean" default="false" />
+ <xs:attribute name="null-representation-for-xml" type="xml-marshal-null-representation" />
+ </xs:complexType>
+ <xs:element name="xml-null-policy" substitutionGroup="xml-abstract-null-policy">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xml-abstract-null-policy">
+ <xs:attribute name="is-set-performed-for-absent-node" type="xs:boolean" default="true" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="xml-is-set-null-policy" substitutionGroup="xml-abstract-null-policy">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xml-abstract-null-policy">
+ <xs:sequence>
+ <xs:element name="is-set-parameter" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="value" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="is-set-method-name" type="xs:string" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index 5579282fc2..044d96f175 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -2122,13 +2122,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_ENTITY__CLASS_EXTRACTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 5;
/**
+ * The feature id for the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY__PARENT_CLASS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6;
+ /**
* The feature id for the '<em><b>Read Only</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6;
+ public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Customizer</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2136,7 +2144,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7;
+ public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2144,7 +2152,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8;
+ public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Cache</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2152,7 +2160,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9;
+ public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Existence Checking</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2160,7 +2168,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10;
+ public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -2168,7 +2176,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11;
+ public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -2176,7 +2184,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12;
+ public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -2184,7 +2192,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13;
+ public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -2192,7 +2200,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14;
+ public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -2200,7 +2208,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15;
+ public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Properties</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -2208,7 +2216,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16;
+ public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2216,7 +2224,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17;
+ public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2224,7 +2232,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18;
+ public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19;
/**
* The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2232,7 +2240,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19;
+ public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 20;
/**
* The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -2240,7 +2248,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 20;
+ public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 21;
/**
* The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -2248,7 +2256,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 21;
+ public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 22;
/**
* The number of structural features of the '<em>Xml Entity</em>' class.
* <!-- begin-user-doc -->
@@ -2256,7 +2264,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 22;
+ public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 23;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
* <!-- begin-user-doc -->
@@ -2485,6 +2493,14 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_FETCH_GROUP__NAME = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__NAME;
/**
+ * The feature id for the '<em><b>Load</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP__LOAD = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__LOAD;
+ /**
* The feature id for the '<em><b>Attributes</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3259,13 +3275,21 @@ public class EclipseLinkOrmPackage extends EPackageImpl
*/
public static final int XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13;
/**
+ * The feature id for the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS__PARENT_CLASS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14;
+ /**
* The feature id for the '<em><b>Read Only</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14;
+ public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Customizer</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3273,7 +3297,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15;
+ public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3281,7 +3305,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16;
+ public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Cache</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3289,7 +3313,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17;
+ public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>Existence Checking</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3297,7 +3321,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18;
+ public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 19;
/**
* The feature id for the '<em><b>Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3305,7 +3329,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 19;
+ public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 20;
/**
* The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3313,7 +3337,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 20;
+ public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 21;
/**
* The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3321,7 +3345,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 21;
+ public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 22;
/**
* The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3329,7 +3353,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 22;
+ public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 23;
/**
* The feature id for the '<em><b>Properties</b></em>' containment reference list.
* <!-- begin-user-doc -->
@@ -3337,7 +3361,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 23;
+ public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 24;
/**
* The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3345,7 +3369,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 24;
+ public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 25;
/**
* The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3353,7 +3377,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 25;
+ public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 26;
/**
* The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3361,7 +3385,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 26;
+ public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 27;
/**
* The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
* <!-- begin-user-doc -->
@@ -3369,7 +3393,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 27;
+ public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 28;
/**
* The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -3377,7 +3401,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 28;
+ public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 29;
/**
* The number of structural features of the '<em>Xml Mapped Superclass</em>' class.
* <!-- begin-user-doc -->
@@ -3385,7 +3409,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 29;
+ public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 30;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class.
* <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
index b0e0eb7a9f..798b039446 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlEntity.java
@@ -130,6 +130,26 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
protected XmlClassReference classExtractor;
/**
+ * The default value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParentClass()
+ * @generated
+ * @ordered
+ */
+ protected static final String PARENT_CLASS_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParentClass()
+ * @generated
+ * @ordered
+ */
+ protected String parentClass = PARENT_CLASS_EDEFAULT;
+
+ /**
* The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1292,6 +1312,41 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
}
/**
+ * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parent Class</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Parent Class</em>' attribute.
+ * @see #setParentClass(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_1_ParentClass()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getParentClass()
+ {
+ return parentClass;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntity#getParentClass <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Parent Class</em>' attribute.
+ * @see #getParentClass()
+ * @generated
+ */
+ public void setParentClass(String newParentClass)
+ {
+ String oldParentClass = parentClass;
+ parentClass = newParentClass;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS, oldParentClass, parentClass));
+ }
+
+ /**
* Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -1400,6 +1455,8 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return getFetchGroups();
case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
return getClassExtractor();
+ case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
+ return getParentClass();
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
return getReadOnly();
case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
@@ -1466,6 +1523,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
setClassExtractor((XmlClassReference)newValue);
return;
+ case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
+ setParentClass((String)newValue);
+ return;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
setReadOnly((Boolean)newValue);
return;
@@ -1552,6 +1612,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
setClassExtractor((XmlClassReference)null);
return;
+ case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
+ setParentClass(PARENT_CLASS_EDEFAULT);
+ return;
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
setReadOnly(READ_ONLY_EDEFAULT);
return;
@@ -1626,6 +1689,8 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return fetchGroups != null && !fetchGroups.isEmpty();
case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
return classExtractor != null;
+ case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
+ return PARENT_CLASS_EDEFAULT == null ? parentClass != null : !PARENT_CLASS_EDEFAULT.equals(parentClass);
case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly);
case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
@@ -1708,6 +1773,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
switch (derivedFeatureID)
{
case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR: return EclipseLinkOrmV2_1Package.XML_ENTITY_21__CLASS_EXTRACTOR;
+ case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS: return EclipseLinkOrmV2_1Package.XML_ENTITY_21__PARENT_CLASS;
default: return -1;
}
}
@@ -1820,6 +1886,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
switch (baseFeatureID)
{
case EclipseLinkOrmV2_1Package.XML_ENTITY_21__CLASS_EXTRACTOR: return EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR;
+ case EclipseLinkOrmV2_1Package.XML_ENTITY_21__PARENT_CLASS: return EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS;
default: return -1;
}
}
@@ -1897,7 +1964,9 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (readOnly: ");
+ result.append(" (parentClass: ");
+ result.append(parentClass);
+ result.append(", readOnly: ");
result.append(readOnly);
result.append(", existenceChecking: ");
result.append(existenceChecking);
@@ -1925,6 +1994,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return new Translator[] {
buildNameTranslator(),
buildClassTranslator(),
+ buildParentClassTranslator(),
buildAccessTranslator(),
buildCacheableTranslator(),
buildMetadataCompleteTranslator(),
@@ -2066,4 +2136,8 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity imple
return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
}
+ protected static Translator buildParentClassTranslator() {
+ return new Translator(EclipseLink2_1.PARENT_CLASS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEntity_2_1_ParentClass(), Translator.DOM_ATTRIBUTE);
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java
index c62518bb1c..b95ae531eb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlFetchGroup.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
+import org.eclipse.jpt.core.resource.orm.JPA;
import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
import org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
@@ -61,6 +62,26 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
protected String name = NAME_EDEFAULT;
/**
+ * The default value of the '{@link #getLoad() <em>Load</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getLoad()
+ * @generated
+ * @ordered
+ */
+ protected static final Boolean LOAD_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getLoad() <em>Load</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getLoad()
+ * @generated
+ * @ordered
+ */
+ protected Boolean load = LOAD_EDEFAULT;
+
+ /**
* The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -150,6 +171,41 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
}
/**
+ * Returns the value of the '<em><b>Load</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Load</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Load</em>' attribute.
+ * @see #setLoad(Boolean)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup_2_1_Load()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ public Boolean getLoad()
+ {
+ return load;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchGroup#getLoad <em>Load</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Load</em>' attribute.
+ * @see #getLoad()
+ * @generated
+ */
+ public void setLoad(Boolean newLoad)
+ {
+ Boolean oldLoad = load;
+ load = newLoad;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD, oldLoad, load));
+ }
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -177,6 +233,8 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
{
case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
return getName();
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
+ return getLoad();
case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
return getAttributes();
}
@@ -197,6 +255,9 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
setName((String)newValue);
return;
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
+ setLoad((Boolean)newValue);
+ return;
case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
getAttributes().clear();
getAttributes().addAll((Collection<? extends XmlFetchAttribute>)newValue);
@@ -218,6 +279,9 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
setName(NAME_EDEFAULT);
return;
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
+ setLoad(LOAD_EDEFAULT);
+ return;
case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
getAttributes().clear();
return;
@@ -237,6 +301,8 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
{
case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
+ return LOAD_EDEFAULT == null ? load != null : !LOAD_EDEFAULT.equals(load);
case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
return attributes != null && !attributes.isEmpty();
}
@@ -256,6 +322,8 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: ");
result.append(name);
+ result.append(", load: ");
+ result.append(load);
result.append(')');
return result.toString();
}
@@ -273,14 +341,20 @@ public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
buildNameTranslator(),
+ buildLoadTranslator(),
buildAttributesTranslator()};
}
private static Translator buildNameTranslator() {
- return new Translator(EclipseLink2_1.NAME, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Name(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA.NAME, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Name(), Translator.DOM_ATTRIBUTE);
}
private static Translator buildAttributesTranslator() {
return XmlFetchAttribute.buildTranslator(EclipseLink2_1.ATTRIBUTE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Attributes());
}
+
+ protected static Translator buildLoadTranslator() {
+ return new Translator(EclipseLink2_1.FETCH_GROUP__LOAD, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Load(), Translator.DOM_ATTRIBUTE);
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
index c4a82a0ba5..ec1c6f9236 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
@@ -234,6 +234,26 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
protected XmlQueryRedirectors queryRedirectors;
/**
+ * The default value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParentClass()
+ * @generated
+ * @ordered
+ */
+ protected static final String PARENT_CLASS_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getParentClass()
+ * @generated
+ * @ordered
+ */
+ protected String parentClass = PARENT_CLASS_EDEFAULT;
+
+ /**
* The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1596,6 +1616,41 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
}
/**
+ * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parent Class</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Parent Class</em>' attribute.
+ * @see #setParentClass(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_1_ParentClass()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ public String getParentClass()
+ {
+ return parentClass;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlMappedSuperclass#getParentClass <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Parent Class</em>' attribute.
+ * @see #getParentClass()
+ * @generated
+ */
+ public void setParentClass(String newParentClass)
+ {
+ String oldParentClass = parentClass;
+ parentClass = newParentClass;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS, oldParentClass, parentClass));
+ }
+
+ /**
* Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -1732,6 +1787,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return getSqlResultSetMappings();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
return getQueryRedirectors();
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
+ return getParentClass();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
return getReadOnly();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
@@ -1826,6 +1883,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
setQueryRedirectors((XmlQueryRedirectors)newValue);
return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
+ setParentClass((String)newValue);
+ return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
setReadOnly((Boolean)newValue);
return;
@@ -1932,6 +1992,9 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
setQueryRedirectors((XmlQueryRedirectors)null);
return;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
+ setParentClass(PARENT_CLASS_EDEFAULT);
+ return;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
setReadOnly(READ_ONLY_EDEFAULT);
return;
@@ -2019,6 +2082,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return sqlResultSetMappings != null && !sqlResultSetMappings.isEmpty();
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
return queryRedirectors != null;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
+ return PARENT_CLASS_EDEFAULT == null ? parentClass != null : !PARENT_CLASS_EDEFAULT.equals(parentClass);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly);
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
@@ -2149,6 +2214,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS;
case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__PARENT_CLASS;
default: return -1;
}
}
@@ -2303,6 +2369,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
{
case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS;
case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS;
+ case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__PARENT_CLASS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS;
default: return -1;
}
}
@@ -2374,6 +2441,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
StringBuffer result = new StringBuffer(super.toString());
result.append(" (cacheable: ");
result.append(cacheable);
+ result.append(", parentClass: ");
+ result.append(parentClass);
result.append(", readOnly: ");
result.append(readOnly);
result.append(", existenceChecking: ");
@@ -2407,6 +2476,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
private static Translator[] buildTranslatorChildren() {
return new Translator[] {
buildClassTranslator(),
+ buildParentClassTranslator(),
buildAccessTranslator(),
buildCacheableTranslator(),
buildMetadataCompleteTranslator(),
@@ -2569,4 +2639,8 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
}
+ protected static Translator buildParentClassTranslator() {
+ return new Translator(EclipseLink2_1.PARENT_CLASS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlMappedSuperclass_2_1_ParentClass(), Translator.DOM_ATTRIBUTE);
+ }
+
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
index d5df45801f..71f83f0ada 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
@@ -31,6 +31,8 @@ public interface EclipseLink2_1
String CACHE_KEY_TYPE = "cache-key-type";
String CLASS_EXTRACTOR = "class-extractor";
String FETCH_GROUP = "fetch-group";
+ String FETCH_GROUP__LOAD = "load";
+ String PARENT_CLASS = "parent-class";
String RETURN_INSERT = "return-insert";
String RETURN_ONLY = "return-only";
String RETURN_UPDATE = "return-update";
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
index 51c40804cf..6edc5edbe3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
@@ -361,13 +361,22 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
public static final int XML_ENTITY_21__CLASS_EXTRACTOR = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 1;
/**
+ * The feature id for the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ENTITY_21__PARENT_CLASS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 2;
+
+ /**
* The number of structural features of the '<em>Xml Entity 21</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ENTITY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 2;
+ public static final int XML_ENTITY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 3;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}' class.
@@ -445,13 +454,22 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
public static final int XML_FETCH_GROUP_21__NAME = 0;
/**
+ * The feature id for the '<em><b>Load</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_FETCH_GROUP_21__LOAD = 1;
+
+ /**
* The feature id for the '<em><b>Attributes</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_FETCH_GROUP_21__ATTRIBUTES = 1;
+ public static final int XML_FETCH_GROUP_21__ATTRIBUTES = 2;
/**
* The number of structural features of the '<em>Xml Fetch Group 21</em>' class.
@@ -460,7 +478,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_FETCH_GROUP_21_FEATURE_COUNT = 2;
+ public static final int XML_FETCH_GROUP_21_FEATURE_COUNT = 3;
/**
* The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
@@ -683,13 +701,22 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
public static final int XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 9;
/**
+ * The feature id for the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_MAPPED_SUPERCLASS_21__PARENT_CLASS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 10;
+
+ /**
* The number of structural features of the '<em>Xml Mapped Superclass 21</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS_21_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 10;
+ public static final int XML_MAPPED_SUPERCLASS_21_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 11;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}' class.
@@ -1393,6 +1420,21 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
}
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass <em>Parent Class</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Parent Class</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass()
+ * @see #getXmlEntity_2_1()
+ * @generated
+ */
+ public EAttribute getXmlEntity_2_1_ParentClass()
+ {
+ return (EAttribute)xmlEntity_2_1EClass.getEStructuralFeatures().get(1);
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1471,10 +1513,25 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
*/
public EReference getXmlFetchGroup_2_1_Attributes()
{
- return (EReference)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(1);
+ return (EReference)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(2);
}
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad <em>Load</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Load</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad()
+ * @see #getXmlFetchGroup_2_1()
+ * @generated
+ */
+ public EAttribute getXmlFetchGroup_2_1_Load()
+ {
+ return (EAttribute)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(1);
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1615,6 +1672,21 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
}
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass <em>Parent Class</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Parent Class</em>'.
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass()
+ * @see #getXmlMappedSuperclass_2_1()
+ * @generated
+ */
+ public EAttribute getXmlMappedSuperclass_2_1_ParentClass()
+ {
+ return (EAttribute)xmlMappedSuperclass_2_1EClass.getEStructuralFeatures().get(2);
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1864,6 +1936,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
xmlEntity_2_1EClass = createEClass(XML_ENTITY_21);
createEReference(xmlEntity_2_1EClass, XML_ENTITY_21__CLASS_EXTRACTOR);
+ createEAttribute(xmlEntity_2_1EClass, XML_ENTITY_21__PARENT_CLASS);
xmlEntityMappings_2_1EClass = createEClass(XML_ENTITY_MAPPINGS_21);
@@ -1872,6 +1945,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
xmlFetchGroup_2_1EClass = createEClass(XML_FETCH_GROUP_21);
createEAttribute(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__NAME);
+ createEAttribute(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__LOAD);
createEReference(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__ATTRIBUTES);
xmlFetchGroupContainer_2_1EClass = createEClass(XML_FETCH_GROUP_CONTAINER_21);
@@ -1888,6 +1962,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
xmlMappedSuperclass_2_1EClass = createEClass(XML_MAPPED_SUPERCLASS_21);
createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS);
createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS);
+ createEAttribute(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__PARENT_CLASS);
xmlOneToMany_2_1EClass = createEClass(XML_ONE_TO_MANY_21);
createEAttribute(xmlOneToMany_2_1EClass, XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE);
@@ -1991,6 +2066,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
initEClass(xmlEntity_2_1EClass, XmlEntity_2_1.class, "XmlEntity_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlEntity_2_1_ClassExtractor(), theOrmPackage.getXmlClassReference(), null, "classExtractor", 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);
+ initEAttribute(getXmlEntity_2_1_ParentClass(), theXMLTypePackage.getString(), "parentClass", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, 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);
@@ -1999,6 +2075,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
initEClass(xmlFetchGroup_2_1EClass, XmlFetchGroup_2_1.class, "XmlFetchGroup_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlFetchGroup_2_1_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getXmlFetchGroup_2_1_Load(), theXMLTypePackage.getBooleanObject(), "load", null, 0, 1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlFetchGroup_2_1_Attributes(), theEclipseLinkOrmPackage.getXmlFetchAttribute(), null, "attributes", null, 0, -1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(xmlFetchGroupContainer_2_1EClass, XmlFetchGroupContainer_2_1.class, "XmlFetchGroupContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2015,6 +2092,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
initEClass(xmlMappedSuperclass_2_1EClass, XmlMappedSuperclass_2_1.class, "XmlMappedSuperclass_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getXmlMappedSuperclass_2_1_SqlResultSetMappings(), theOrmPackage.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlMappedSuperclass_2_1_QueryRedirectors(), theEclipseLinkOrmPackage.getXmlQueryRedirectors(), null, "queryRedirectors", null, 0, 1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getXmlMappedSuperclass_2_1_ParentClass(), theXMLTypePackage.getString(), "parentClass", null, 0, 1, XmlMappedSuperclass_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);
initEAttribute(getXmlOneToMany_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2204,6 +2282,14 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
public static final EReference XML_ENTITY_21__CLASS_EXTRACTOR = eINSTANCE.getXmlEntity_2_1_ClassExtractor();
/**
+ * The meta object literal for the '<em><b>Parent Class</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_ENTITY_21__PARENT_CLASS = eINSTANCE.getXmlEntity_2_1_ParentClass();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2258,6 +2344,14 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
public static final EReference XML_FETCH_GROUP_21__ATTRIBUTES = eINSTANCE.getXmlFetchGroup_2_1_Attributes();
/**
+ * The meta object literal for the '<em><b>Load</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_FETCH_GROUP_21__LOAD = eINSTANCE.getXmlFetchGroup_2_1_Load();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2348,6 +2442,14 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
public static final EReference XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = eINSTANCE.getXmlMappedSuperclass_2_1_QueryRedirectors();
/**
+ * The meta object literal for the '<em><b>Parent Class</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_MAPPED_SUPERCLASS_21__PARENT_CLASS = eINSTANCE.getXmlMappedSuperclass_2_1_ParentClass();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
index 4ee2099d06..368f1b68f0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
@@ -32,6 +32,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}</li>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass <em>Parent Class</em>}</li>
* </ul>
* </p>
*
@@ -67,4 +68,30 @@ public interface XmlEntity_2_1 extends XmlAccessMethodsHolder, XmlFetchGroupCont
*/
void setClassExtractor(XmlClassReference value);
+ /**
+ * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parent Class</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Parent Class</em>' attribute.
+ * @see #setParentClass(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1_ParentClass()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ String getParentClass();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Parent Class</em>' attribute.
+ * @see #getParentClass()
+ * @generated
+ */
+ void setParentClass(String value);
+
} // XmlEntity_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
index c97b95c44f..4d86d800b8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
@@ -24,6 +24,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlFetchAttribute;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad <em>Load</em>}</li>
* <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes <em>Attributes</em>}</li>
* </ul>
* </p>
@@ -77,4 +78,30 @@ public interface XmlFetchGroup_2_1 extends JpaEObject
*/
EList<XmlFetchAttribute> getAttributes();
+ /**
+ * Returns the value of the '<em><b>Load</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Load</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Load</em>' attribute.
+ * @see #setLoad(Boolean)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1_Load()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
+ * @generated
+ */
+ Boolean getLoad();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad <em>Load</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Load</em>' attribute.
+ * @see #getLoad()
+ * @generated
+ */
+ void setLoad(Boolean value);
+
} // XmlFetchGroup_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
index a456901e78..a23d1da66e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
@@ -39,6 +39,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlQueryRedirectors;
* <ul>
* <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li>
* <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}</li>
+ * <li>{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass <em>Parent Class</em>}</li>
* </ul>
* </p>
*
@@ -90,4 +91,30 @@ public interface XmlMappedSuperclass_2_1 extends XmlAssociationOverrideContainer
*/
void setQueryRedirectors(XmlQueryRedirectors value);
+ /**
+ * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Parent Class</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Parent Class</em>' attribute.
+ * @see #setParentClass(String)
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1_ParentClass()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ String getParentClass();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass <em>Parent Class</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Parent Class</em>' attribute.
+ * @see #getParentClass()
+ * @generated
+ */
+ void setParentClass(String value);
+
} // XmlMappedSuperclass_2_1

Back to the top