Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2009-11-25 11:42:27 -0500
committerkmoore2009-11-25 11:42:27 -0500
commit73d9e4add9dce459679297e83c077eab381a4b60 (patch)
treecfe2bf4e0286ea4496a7e254d65a5e56bec150cb
parent53d467e8e59b8730ec3e1daf792d2cb0cdbbd281 (diff)
downloadwebtools.dali-73d9e4add9dce459679297e83c077eab381a4b60.tar.gz
webtools.dali-73d9e4add9dce459679297e83c077eab381a4b60.tar.xz
webtools.dali-73d9e4add9dce459679297e83c077eab381a4b60.zip
refactored XmlOrderable resource model further for easier support of orderBy on element collection mappings
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel8
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/model/orm.ecore15
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java124
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java72
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java359
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java88
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java97
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java98
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOrderable.java64
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java61
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java30
12 files changed, 420 insertions, 598 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
index b8f083921b..a13c5ffdca 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
@@ -54,9 +54,6 @@
<genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/TIME"/>
<genEnumLiterals ecoreEnumLiteral="orm.ecore#//TemporalType/TIMESTAMP"/>
</genEnums>
- <genDataTypes ecoreDataType="orm.ecore#//DiscriminatorValue"/>
- <genDataTypes ecoreDataType="orm.ecore#//Enumerated"/>
- <genDataTypes ecoreDataType="orm.ecore#//OrderBy"/>
<genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlAttributeMapping"/>
<genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlColumn">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlColumn/insertable"/>
@@ -67,7 +64,6 @@
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlEmbedded"/>
<genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlMultiRelationshipMapping">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//AbstractXmlMultiRelationshipMapping/orderBy"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//AbstractXmlMultiRelationshipMapping/mapKey"/>
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//AbstractXmlNamedColumn">
@@ -337,6 +333,9 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlUniqueConstraint/columnNames"/>
</genClasses>
<genClasses image="false" ecoreClass="orm.ecore#//XmlVersion"/>
+ <genClasses image="false" ecoreClass="orm.ecore#//XmlOrderable">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//XmlOrderable/orderBy"/>
+ </genClasses>
<nestedGenPackages prefix="OrmV2_0" basePackage="org.eclipse.jpt.core.resource.orm"
disposableProviderFactory="true" adapterFactory="false" ecorePackage="orm.ecore#//v2_0">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="orm.ecore#//v2_0/LockModeType_2_0">
@@ -370,7 +369,6 @@
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlElementCollection_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/targetClass"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/fetch"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/orderBy"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKey"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyClass"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlElementCollection_2_0/mapKeyTemporal"/>
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
index da805fb42d..0585c7591b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
@@ -15,8 +15,7 @@
<eClassifiers xsi:type="ecore:EClass" name="AbstractXmlEmbedded" abstract="true"
eSuperTypes="#//AbstractXmlAttributeMapping #//XmlAttributeOverrideContainer"/>
<eClassifiers xsi:type="ecore:EClass" name="AbstractXmlMultiRelationshipMapping"
- abstract="true" eSuperTypes="#//AbstractXmlRelationshipMapping #//XmlMappedByMapping #//XmlJoinTableMapping">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderBy" eType="#//OrderBy"/>
+ abstract="true" eSuperTypes="#//AbstractXmlRelationshipMapping #//XmlMappedByMapping #//XmlJoinTableMapping #//XmlOrderable">
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"
containment="true" resolveProxies="false"/>
</eClassifiers>
@@ -144,7 +143,7 @@
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="inheritance" eType="#//Inheritance"
containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorValue" eType="#//DiscriminatorValue"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="discriminatorColumn" eType="#//XmlDiscriminatorColumn"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1"
@@ -380,9 +379,10 @@
lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlVersion" eSuperTypes="#//AbstractXmlAttributeMapping #//ColumnMapping #//XmlConvertibleMapping"/>
- <eClassifiers xsi:type="ecore:EDataType" name="DiscriminatorValue" instanceClassName="java.lang.String"/>
- <eClassifiers xsi:type="ecore:EDataType" name="Enumerated" instanceClassName="org.eclipse.emf.common.util.Enumerator"/>
- <eClassifiers xsi:type="ecore:EDataType" name="OrderBy" instanceClassName="java.lang.String"/>
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOrderable" abstract="true" interface="true"
+ eSuperTypes="#//v2_0/XmlOrderable_2_0">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderBy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="AccessType">
<eLiterals name="PROPERTY"/>
<eLiterals name="FIELD" value="1"/>
@@ -445,10 +445,9 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlElementCollection_2_0" abstract="true"
- interface="true" eSuperTypes="#//XmlConvertibleMapping #//v2_0/XmlOrderable_2_0">
+ interface="true" eSuperTypes="#//XmlConvertibleMapping #//XmlOrderable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="targetClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderBy" eType="#//OrderBy"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlMapKeyClass"
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java
index 1c0fed1ebf..b096eb26fa 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java
@@ -14,6 +14,8 @@ import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrderable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -32,7 +34,6 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}</li>
* </ul>
* </p>
@@ -41,7 +42,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class" abstract="true"
* @generated
*/
-public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRelationshipMapping implements XmlMappedByMapping, XmlJoinTableMapping
+public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRelationshipMapping implements XmlMappedByMapping, XmlJoinTableMapping, XmlOrderable
{
/**
* The default value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute.
@@ -71,6 +72,15 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
*/
protected XmlJoinTable joinTable;
/**
+ * The cached value of the '{@link #getOrderColumn() <em>Order Column</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrderColumn()
+ * @generated
+ * @ordered
+ */
+ protected XmlOrderColumn orderColumn;
+ /**
* The default value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -215,6 +225,66 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
}
/**
+ * Returns the value of the '<em><b>Order Column</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Order Column</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Order Column</em>' containment reference.
+ * @see #setOrderColumn(XmlOrderColumn)
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable_2_0_OrderColumn()
+ * @model containment="true"
+ * @generated
+ */
+ public XmlOrderColumn getOrderColumn()
+ {
+ return orderColumn;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetOrderColumn(XmlOrderColumn newOrderColumn, NotificationChain msgs)
+ {
+ XmlOrderColumn oldOrderColumn = orderColumn;
+ orderColumn = newOrderColumn;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN, oldOrderColumn, newOrderColumn);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping#getOrderColumn <em>Order Column</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Order Column</em>' containment reference.
+ * @see #getOrderColumn()
+ * @generated
+ */
+ public void setOrderColumn(XmlOrderColumn newOrderColumn)
+ {
+ if (newOrderColumn != orderColumn)
+ {
+ NotificationChain msgs = null;
+ if (orderColumn != null)
+ msgs = ((InternalEObject)orderColumn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN, null, msgs);
+ if (newOrderColumn != null)
+ msgs = ((InternalEObject)newOrderColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN, null, msgs);
+ msgs = basicSetOrderColumn(newOrderColumn, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN, newOrderColumn, newOrderColumn));
+ }
+
+ /**
* Returns the value of the '<em><b>Order By</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -224,8 +294,8 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
* <!-- end-user-doc -->
* @return the value of the '<em>Order By</em>' attribute.
* @see #setOrderBy(String)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractXmlMultiRelationshipMapping_OrderBy()
- * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable_OrderBy()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
* @generated
*/
public String getOrderBy() {
@@ -317,6 +387,8 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
{
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE:
return basicSetJoinTable(null, msgs);
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN:
+ return basicSetOrderColumn(null, msgs);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY:
return basicSetMapKey(null, msgs);
}
@@ -337,6 +409,8 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
return getMappedBy();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE:
return getJoinTable();
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN:
+ return getOrderColumn();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
return getOrderBy();
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY:
@@ -361,6 +435,9 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE:
setJoinTable((XmlJoinTable)newValue);
return;
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN:
+ setOrderColumn((XmlOrderColumn)newValue);
+ return;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
setOrderBy((String)newValue);
return;
@@ -387,6 +464,9 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE:
setJoinTable((XmlJoinTable)null);
return;
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN:
+ setOrderColumn((XmlOrderColumn)null);
+ return;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
setOrderBy(ORDER_BY_EDEFAULT);
return;
@@ -411,6 +491,8 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
return MAPPED_BY_EDEFAULT == null ? mappedBy != null : !MAPPED_BY_EDEFAULT.equals(mappedBy);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE:
return joinTable != null;
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN:
+ return orderColumn != null;
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY:
return ORDER_BY_EDEFAULT == null ? orderBy != null : !ORDER_BY_EDEFAULT.equals(orderBy);
case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY:
@@ -443,6 +525,22 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
default: return -1;
}
}
+ if (baseClass == XmlOrderable_2_0.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN: return OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlOrderable.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY: return OrmPackage.XML_ORDERABLE__ORDER_BY;
+ default: return -1;
+ }
+ }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -470,6 +568,22 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
default: return -1;
}
}
+ if (baseClass == XmlOrderable_2_0.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN;
+ default: return -1;
+ }
+ }
+ if (baseClass == XmlOrderable.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmPackage.XML_ORDERABLE__ORDER_BY: return OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
+ default: return -1;
+ }
+ }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
@@ -499,7 +613,7 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel
// ********** translators **********
protected static Translator buildOrderByTranslator() {
- return new Translator(JPA.ORDER_BY, OrmPackage.eINSTANCE.getAbstractXmlMultiRelationshipMapping_OrderBy());
+ return new Translator(JPA.ORDER_BY, OrmPackage.eINSTANCE.getXmlOrderable_OrderBy());
}
protected static Translator buildMapKeyTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java
index 976c8e3c2f..f3fd9d879b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java
@@ -165,12 +165,6 @@ public class OrmFactory extends EFactoryImpl
return createInheritanceTypeFromString(eDataType, initialValue);
case OrmPackage.TEMPORAL_TYPE:
return createTemporalTypeFromString(eDataType, initialValue);
- case OrmPackage.DISCRIMINATOR_VALUE:
- return createDiscriminatorValueFromString(eDataType, initialValue);
- case OrmPackage.ENUMERATED:
- return createEnumeratedFromString(eDataType, initialValue);
- case OrmPackage.ORDER_BY:
- return createOrderByFromString(eDataType, initialValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
@@ -200,12 +194,6 @@ public class OrmFactory extends EFactoryImpl
return convertInheritanceTypeToString(eDataType, instanceValue);
case OrmPackage.TEMPORAL_TYPE:
return convertTemporalTypeToString(eDataType, instanceValue);
- case OrmPackage.DISCRIMINATOR_VALUE:
- return convertDiscriminatorValueToString(eDataType, instanceValue);
- case OrmPackage.ENUMERATED:
- return convertEnumeratedToString(eDataType, instanceValue);
- case OrmPackage.ORDER_BY:
- return convertOrderByToString(eDataType, instanceValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
@@ -975,66 +963,6 @@ public class OrmFactory extends EFactoryImpl
* <!-- end-user-doc -->
* @generated
*/
- public String createDiscriminatorValueFromString(EDataType eDataType, String initialValue)
- {
- return (String)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertDiscriminatorValueToString(EDataType eDataType, Object instanceValue)
- {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Enumerator createEnumeratedFromString(EDataType eDataType, String initialValue)
- {
- return (Enumerator)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertEnumeratedToString(EDataType eDataType, Object instanceValue)
- {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String createOrderByFromString(EDataType eDataType, String initialValue)
- {
- return (String)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertOrderByToString(EDataType eDataType, Object instanceValue)
- {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public OrmPackage getOrmPackage()
{
return (OrmPackage)getEPackage();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
index ca57401dc4..c59a464250 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
@@ -480,13 +480,22 @@ public class OrmPackage extends EPackageImpl
public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
/**
+ * The feature id for the '<em><b>Order Column</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
+
+ /**
* The feature id for the '<em><b>Order By</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Map Key</b></em>' containment reference.
@@ -495,7 +504,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
/**
* The number of structural features of the '<em>Abstract Xml Multi Relationship Mapping</em>' class.
@@ -504,7 +513,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
+ public static final int ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT = ABSTRACT_XML_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlSingleRelationshipMapping <em>Abstract Xml Single Relationship Mapping</em>}' class.
@@ -1660,31 +1669,31 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION__ORDER_COLUMN = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Target Class</b></em>' attribute.
+ * The feature id for the '<em><b>Order By</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_ELEMENT_COLLECTION__ORDER_BY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Fetch</b></em>' attribute.
+ * The feature id for the '<em><b>Target Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Order By</b></em>' attribute.
+ * The feature id for the '<em><b>Fetch</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION__ORDER_BY = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_ELEMENT_COLLECTION__FETCH = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Map Key</b></em>' containment reference.
@@ -3550,31 +3559,31 @@ public class OrmPackage extends EPackageImpl
public static final int XML_MANY_TO_MANY__JOIN_TABLE = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE;
/**
- * The feature id for the '<em><b>Order By</b></em>' attribute.
+ * The feature id for the '<em><b>Order Column</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__ORDER_BY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
+ public static final int XML_MANY_TO_MANY__ORDER_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN;
/**
- * The feature id for the '<em><b>Map Key</b></em>' containment reference.
+ * The feature id for the '<em><b>Order By</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY;
+ public static final int XML_MANY_TO_MANY__ORDER_BY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY;
/**
- * The feature id for the '<em><b>Order Column</b></em>' containment reference.
+ * The feature id for the '<em><b>Map Key</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__ORDER_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
+ public static final int XML_MANY_TO_MANY__MAP_KEY = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY;
/**
* The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
@@ -3583,7 +3592,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
@@ -3592,7 +3601,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
@@ -3601,7 +3610,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
@@ -3610,7 +3619,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -3619,7 +3628,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
@@ -3628,7 +3637,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY__MAP_KEY_JOIN_COLUMNS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_MANY_TO_MANY__MAP_KEY_JOIN_COLUMNS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
/**
* The number of structural features of the '<em>Xml Many To Many</em>' class.
@@ -3637,7 +3646,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MANY_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_MANY_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -4135,6 +4144,15 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ONE_TO_MANY__JOIN_TABLE = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__JOIN_TABLE;
/**
+ * The feature id for the '<em><b>Order Column</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ONE_TO_MANY__ORDER_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_COLUMN;
+
+ /**
* The feature id for the '<em><b>Order By</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4171,22 +4189,13 @@ public class OrmPackage extends EPackageImpl
public static final int XML_ONE_TO_MANY__ORPHAN_REMOVAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Order Column</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int XML_ONE_TO_MANY__ORDER_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
-
- /**
* The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
@@ -4195,7 +4204,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
@@ -4204,7 +4213,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
@@ -4213,7 +4222,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -4222,7 +4231,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 7;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_COLUMN = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
@@ -4231,7 +4240,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY__MAP_KEY_JOIN_COLUMNS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 8;
+ public static final int XML_ONE_TO_MANY__MAP_KEY_JOIN_COLUMNS = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 7;
/**
* The number of structural features of the '<em>Xml One To Many</em>' class.
@@ -4240,7 +4249,7 @@ public class OrmPackage extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 9;
+ public static final int XML_ONE_TO_MANY_FEATURE_COUNT = ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>Access</b></em>' attribute.
@@ -5350,6 +5359,43 @@ public class OrmPackage extends EPackageImpl
public static final int XML_VERSION_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
/**
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlOrderable
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable()
+ * @generated
+ */
+ public static final int XML_ORDERABLE = 81;
+
+ /**
+ * The feature id for the '<em><b>Order Column</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ORDERABLE__ORDER_COLUMN = OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN;
+
+ /**
+ * The feature id for the '<em><b>Order By</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ORDERABLE__ORDER_BY = OrmV2_0Package.XML_ORDERABLE_20_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>Xml Orderable</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int XML_ORDERABLE_FEATURE_COUNT = OrmV2_0Package.XML_ORDERABLE_20_FEATURE_COUNT + 1;
+
+ /**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5357,7 +5403,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType()
* @generated
*/
- public static final int ACCESS_TYPE = 81;
+ public static final int ACCESS_TYPE = 82;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum.
@@ -5367,7 +5413,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType()
* @generated
*/
- public static final int DISCRIMINATOR_TYPE = 82;
+ public static final int DISCRIMINATOR_TYPE = 83;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}' enum.
@@ -5377,7 +5423,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType()
* @generated
*/
- public static final int ENUM_TYPE = 83;
+ public static final int ENUM_TYPE = 84;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}' enum.
@@ -5387,7 +5433,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType()
* @generated
*/
- public static final int FETCH_TYPE = 84;
+ public static final int FETCH_TYPE = 85;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}' enum.
@@ -5397,7 +5443,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType()
* @generated
*/
- public static final int GENERATION_TYPE = 85;
+ public static final int GENERATION_TYPE = 86;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum.
@@ -5407,7 +5453,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType()
* @generated
*/
- public static final int INHERITANCE_TYPE = 86;
+ public static final int INHERITANCE_TYPE = 87;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum.
@@ -5417,37 +5463,7 @@ public class OrmPackage extends EPackageImpl
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType()
* @generated
*/
- public static final int TEMPORAL_TYPE = 87;
-
- /**
- * The meta object id for the '<em>Discriminator Value</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorValue()
- * @generated
- */
- public static final int DISCRIMINATOR_VALUE = 88;
-
- /**
- * The meta object id for the '<em>Enumerated</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.common.util.Enumerator
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumerated()
- * @generated
- */
- public static final int ENUMERATED = 89;
-
- /**
- * The meta object id for the '<em>Order By</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOrderBy()
- * @generated
- */
- public static final int ORDER_BY = 90;
+ public static final int TEMPORAL_TYPE = 88;
/**
* <!-- begin-user-doc -->
@@ -6021,6 +6037,13 @@ public class OrmPackage extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
+ private EClass xmlOrderableEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EEnum accessTypeEEnum = null;
/**
@@ -6066,27 +6089,6 @@ public class OrmPackage extends EPackageImpl
private EEnum temporalTypeEEnum = null;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType discriminatorValueEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType enumeratedEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType orderByEDataType = null;
-
- /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -6291,20 +6293,6 @@ public class OrmPackage extends EPackageImpl
}
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Order By</em>'.
- * @see org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping#getOrderBy()
- * @see #getAbstractXmlMultiRelationshipMapping()
- * @generated
- */
- public EAttribute getAbstractXmlMultiRelationshipMapping_OrderBy()
- {
- return (EAttribute)abstractXmlMultiRelationshipMappingEClass.getEStructuralFeatures().get(0);
- }
-
- /**
* Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -6315,7 +6303,7 @@ public class OrmPackage extends EPackageImpl
*/
public EReference getAbstractXmlMultiRelationshipMapping_MapKey()
{
- return (EReference)abstractXmlMultiRelationshipMappingEClass.getEStructuralFeatures().get(1);
+ return (EReference)abstractXmlMultiRelationshipMappingEClass.getEStructuralFeatures().get(0);
}
/**
@@ -9238,6 +9226,35 @@ public class OrmPackage extends EPackageImpl
}
/**
+ * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Xml Orderable</em>'.
+ * @see org.eclipse.jpt.core.resource.orm.XmlOrderable
+ * @generated
+ */
+ public EClass getXmlOrderable()
+ {
+ return xmlOrderableEClass;
+ }
+
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable#getOrderBy <em>Order By</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Order By</em>'.
+ * @see org.eclipse.jpt.core.resource.orm.XmlOrderable#getOrderBy()
+ * @see #getXmlOrderable()
+ * @generated
+ */
+ public EAttribute getXmlOrderable_OrderBy()
+ {
+ return (EAttribute)xmlOrderableEClass.getEStructuralFeatures().get(0);
+ }
+
+
+ /**
* Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9329,48 +9346,6 @@ public class OrmPackage extends EPackageImpl
}
/**
- * Returns the meta object for data type '{@link java.lang.String <em>Discriminator Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Discriminator Value</em>'.
- * @see java.lang.String
- * @model instanceClass="java.lang.String"
- * @generated
- */
- public EDataType getDiscriminatorValue()
- {
- return discriminatorValueEDataType;
- }
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Enumerator <em>Enumerated</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Enumerated</em>'.
- * @see org.eclipse.emf.common.util.Enumerator
- * @model instanceClass="org.eclipse.emf.common.util.Enumerator"
- * @generated
- */
- public EDataType getEnumerated()
- {
- return enumeratedEDataType;
- }
-
- /**
- * Returns the meta object for data type '{@link java.lang.String <em>Order By</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Order By</em>'.
- * @see java.lang.String
- * @model instanceClass="java.lang.String"
- * @generated
- */
- public EDataType getOrderBy()
- {
- return orderByEDataType;
- }
-
- /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9414,7 +9389,6 @@ public class OrmPackage extends EPackageImpl
abstractXmlEmbeddedEClass = createEClass(ABSTRACT_XML_EMBEDDED);
abstractXmlMultiRelationshipMappingEClass = createEClass(ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING);
- createEAttribute(abstractXmlMultiRelationshipMappingEClass, ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY);
createEReference(abstractXmlMultiRelationshipMappingEClass, ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY);
abstractXmlNamedColumnEClass = createEClass(ABSTRACT_XML_NAMED_COLUMN);
@@ -9708,6 +9682,9 @@ public class OrmPackage extends EPackageImpl
xmlVersionEClass = createEClass(XML_VERSION);
+ xmlOrderableEClass = createEClass(XML_ORDERABLE);
+ createEAttribute(xmlOrderableEClass, XML_ORDERABLE__ORDER_BY);
+
// Create enums
accessTypeEEnum = createEEnum(ACCESS_TYPE);
discriminatorTypeEEnum = createEEnum(DISCRIMINATOR_TYPE);
@@ -9716,11 +9693,6 @@ public class OrmPackage extends EPackageImpl
generationTypeEEnum = createEEnum(GENERATION_TYPE);
inheritanceTypeEEnum = createEEnum(INHERITANCE_TYPE);
temporalTypeEEnum = createEEnum(TEMPORAL_TYPE);
-
- // Create data types
- discriminatorValueEDataType = createEDataType(DISCRIMINATOR_VALUE);
- enumeratedEDataType = createEDataType(ENUMERATED);
- orderByEDataType = createEDataType(ORDER_BY);
}
/**
@@ -9767,6 +9739,7 @@ public class OrmPackage extends EPackageImpl
abstractXmlMultiRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlRelationshipMapping());
abstractXmlMultiRelationshipMappingEClass.getESuperTypes().add(this.getXmlMappedByMapping());
abstractXmlMultiRelationshipMappingEClass.getESuperTypes().add(this.getXmlJoinTableMapping());
+ abstractXmlMultiRelationshipMappingEClass.getESuperTypes().add(this.getXmlOrderable());
abstractXmlRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
abstractXmlSingleRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlRelationshipMapping());
abstractXmlSingleRelationshipMappingEClass.getESuperTypes().add(this.getXmlJoinTableMapping());
@@ -9853,6 +9826,7 @@ public class OrmPackage extends EPackageImpl
xmlVersionEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping());
xmlVersionEClass.getESuperTypes().add(this.getColumnMapping());
xmlVersionEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
+ xmlOrderableEClass.getESuperTypes().add(theOrmV2_0Package.getXmlOrderable_2_0());
// Initialize classes and features; add operations and parameters
initEClass(abstractXmlAttributeMappingEClass, AbstractXmlAttributeMapping.class, "AbstractXmlAttributeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -9867,7 +9841,6 @@ public class OrmPackage extends EPackageImpl
initEClass(abstractXmlEmbeddedEClass, AbstractXmlEmbedded.class, "AbstractXmlEmbedded", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(abstractXmlMultiRelationshipMappingEClass, AbstractXmlMultiRelationshipMapping.class, "AbstractXmlMultiRelationshipMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAbstractXmlMultiRelationshipMapping_OrderBy(), this.getOrderBy(), "orderBy", null, 0, 1, AbstractXmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getAbstractXmlMultiRelationshipMapping_MapKey(), this.getMapKey(), null, "mapKey", null, 0, 1, AbstractXmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(abstractXmlNamedColumnEClass, AbstractXmlNamedColumn.class, "AbstractXmlNamedColumn", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -9969,7 +9942,7 @@ public class OrmPackage extends EPackageImpl
initEReference(getXmlEntity_PrimaryKeyJoinColumns(), this.getXmlPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_IdClass(), this.getXmlIdClass(), null, "idClass", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_Inheritance(), this.getInheritance(), null, "inheritance", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getXmlEntity_DiscriminatorValue(), this.getDiscriminatorValue(), "discriminatorValue", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getXmlEntity_DiscriminatorValue(), theXMLTypePackage.getString(), "discriminatorValue", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_DiscriminatorColumn(), this.getXmlDiscriminatorColumn(), null, "discriminatorColumn", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlEntity_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlEntity_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -10161,6 +10134,9 @@ public class OrmPackage extends EPackageImpl
initEClass(xmlVersionEClass, XmlVersion.class, "XmlVersion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(xmlOrderableEClass, XmlOrderable.class, "XmlOrderable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlOrderable_OrderBy(), theXMLTypePackage.getString(), "orderBy", null, 0, 1, XmlOrderable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
// Initialize enums and add enum literals
initEEnum(accessTypeEEnum, AccessType.class, "AccessType");
addEEnumLiteral(accessTypeEEnum, AccessType.PROPERTY);
@@ -10195,11 +10171,6 @@ public class OrmPackage extends EPackageImpl
addEEnumLiteral(temporalTypeEEnum, TemporalType.TIME);
addEEnumLiteral(temporalTypeEEnum, TemporalType.TIMESTAMP);
- // Initialize data types
- initEDataType(discriminatorValueEDataType, String.class, "DiscriminatorValue", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(enumeratedEDataType, Enumerator.class, "Enumerated", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(orderByEDataType, String.class, "OrderBy", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
// Create resource
createResource(eNS_URI);
}
@@ -10299,14 +10270,6 @@ public class OrmPackage extends EPackageImpl
public static final EClass ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING = eINSTANCE.getAbstractXmlMultiRelationshipMapping();
/**
- * The meta object literal for the '<em><b>Order By</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__ORDER_BY = eINSTANCE.getAbstractXmlMultiRelationshipMapping_OrderBy();
-
- /**
* The meta object literal for the '<em><b>Map Key</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12181,6 +12144,24 @@ public class OrmPackage extends EPackageImpl
public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
/**
+ * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.jpt.core.resource.orm.XmlOrderable
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable()
+ * @generated
+ */
+ public static final EClass XML_ORDERABLE = eINSTANCE.getXmlOrderable();
+
+ /**
+ * The meta object literal for the '<em><b>Order By</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute XML_ORDERABLE__ORDER_BY = eINSTANCE.getXmlOrderable_OrderBy();
+
+ /**
* The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -12250,36 +12231,6 @@ public class OrmPackage extends EPackageImpl
*/
public static final EEnum TEMPORAL_TYPE = eINSTANCE.getTemporalType();
- /**
- * The meta object literal for the '<em>Discriminator Value</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorValue()
- * @generated
- */
- public static final EDataType DISCRIMINATOR_VALUE = eINSTANCE.getDiscriminatorValue();
-
- /**
- * The meta object literal for the '<em>Enumerated</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.common.util.Enumerator
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumerated()
- * @generated
- */
- public static final EDataType ENUMERATED = eINSTANCE.getEnumerated();
-
- /**
- * The meta object literal for the '<em>Order By</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOrderBy()
- * @generated
- */
- public static final EDataType ORDER_BY = eINSTANCE.getOrderBy();
-
}
} //OrmPackage
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
index 5fe4c2fb6d..c1b12bfcb4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
@@ -107,6 +107,26 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
protected XmlOrderColumn orderColumn;
/**
+ * The default value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrderBy()
+ * @generated
+ * @ordered
+ */
+ protected static final String ORDER_BY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getOrderBy()
+ * @generated
+ * @ordered
+ */
+ protected String orderBy = ORDER_BY_EDEFAULT;
+
+ /**
* The default value of the '{@link #getTargetClass() <em>Target Class</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -143,26 +163,6 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
protected FetchType fetch = FETCH_EDEFAULT;
/**
- * The default value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOrderBy()
- * @generated
- * @ordered
- */
- protected static final String ORDER_BY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getOrderBy() <em>Order By</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOrderBy()
- * @generated
- * @ordered
- */
- protected String orderBy = ORDER_BY_EDEFAULT;
-
- /**
* The cached value of the '{@link #getMapKey() <em>Map Key</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -499,8 +499,8 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
* <!-- end-user-doc -->
* @return the value of the '<em>Order By</em>' attribute.
* @see #setOrderBy(String)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlElementCollection_2_0_OrderBy()
- * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable_OrderBy()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
* @generated
*/
public String getOrderBy()
@@ -1104,12 +1104,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return getEnumerated();
case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_COLUMN:
return getOrderColumn();
+ case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
+ return getOrderBy();
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
return getTargetClass();
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH:
return getFetch();
- case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
- return getOrderBy();
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY:
return getMapKey();
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS:
@@ -1159,15 +1159,15 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_COLUMN:
setOrderColumn((XmlOrderColumn)newValue);
return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
+ setOrderBy((String)newValue);
+ return;
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
setTargetClass((String)newValue);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH:
setFetch((FetchType)newValue);
return;
- case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
- setOrderBy((String)newValue);
- return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY:
setMapKey((MapKey)newValue);
return;
@@ -1231,15 +1231,15 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_COLUMN:
setOrderColumn((XmlOrderColumn)null);
return;
+ case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
+ setOrderBy(ORDER_BY_EDEFAULT);
+ return;
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
setTargetClass(TARGET_CLASS_EDEFAULT);
return;
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH:
setFetch(FETCH_EDEFAULT);
return;
- case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
- setOrderBy(ORDER_BY_EDEFAULT);
- return;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY:
setMapKey((MapKey)null);
return;
@@ -1295,12 +1295,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
return enumerated != ENUMERATED_EDEFAULT;
case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_COLUMN:
return orderColumn != null;
+ case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
+ return ORDER_BY_EDEFAULT == null ? orderBy != null : !ORDER_BY_EDEFAULT.equals(orderBy);
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS:
return TARGET_CLASS_EDEFAULT == null ? targetClass != null : !TARGET_CLASS_EDEFAULT.equals(targetClass);
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH:
return fetch != FETCH_EDEFAULT;
- case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY:
- return ORDER_BY_EDEFAULT == null ? orderBy != null : !ORDER_BY_EDEFAULT.equals(orderBy);
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY:
return mapKey != null;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS:
@@ -1353,13 +1353,20 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
default: return -1;
}
}
+ if (baseClass == XmlOrderable.class)
+ {
+ switch (derivedFeatureID)
+ {
+ case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY: return OrmPackage.XML_ORDERABLE__ORDER_BY;
+ default: return -1;
+ }
+ }
if (baseClass == XmlElementCollection_2_0.class)
{
switch (derivedFeatureID)
{
case OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__TARGET_CLASS;
case OrmPackage.XML_ELEMENT_COLLECTION__FETCH: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__FETCH;
- case OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__ORDER_BY;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS;
case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL: return OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL;
@@ -1403,13 +1410,20 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
default: return -1;
}
}
+ if (baseClass == XmlOrderable.class)
+ {
+ switch (baseFeatureID)
+ {
+ case OrmPackage.XML_ORDERABLE__ORDER_BY: return OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY;
+ default: return -1;
+ }
+ }
if (baseClass == XmlElementCollection_2_0.class)
{
switch (baseFeatureID)
{
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__TARGET_CLASS: return OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__FETCH: return OrmPackage.XML_ELEMENT_COLLECTION__FETCH;
- case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__ORDER_BY: return OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS;
case OrmV2_0Package.XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL: return OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL;
@@ -1444,12 +1458,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
result.append(temporal);
result.append(", enumerated: ");
result.append(enumerated);
+ result.append(", orderBy: ");
+ result.append(orderBy);
result.append(", targetClass: ");
result.append(targetClass);
result.append(", fetch: ");
result.append(fetch);
- result.append(", orderBy: ");
- result.append(orderBy);
result.append(", mapKeyTemporal: ");
result.append(mapKeyTemporal);
result.append(", mapKeyEnumerated: ");
@@ -1524,7 +1538,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
}
protected static Translator buildOrderByTranslator() {
- return new BooleanTranslator(JPA.ORDER_BY, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_OrderBy());
+ return new BooleanTranslator(JPA.ORDER_BY, OrmPackage.eINSTANCE.getXmlOrderable_OrderBy());
}
protected static Translator buildColumnTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
index 5807fda96e..01a3b08dc0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
@@ -676,7 +676,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* @return the value of the '<em>Discriminator Value</em>' attribute.
* @see #setDiscriminatorValue(String)
* @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlEntity_DiscriminatorValue()
- * @model dataType="org.eclipse.jpt.core.resource.orm.DiscriminatorValue"
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
* @generated
*/
public String getDiscriminatorValue()
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
index 3b7cbd58d1..e3a38d8c8c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java
@@ -47,15 +47,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
/**
- * The cached value of the '{@link #getOrderColumn() <em>Order Column</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOrderColumn()
- * @generated
- * @ordered
- */
- protected XmlOrderColumn orderColumn;
- /**
* The cached value of the '{@link #getMapKeyClass() <em>Map Key Class</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -142,66 +133,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
}
/**
- * Returns the value of the '<em><b>Order Column</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Order Column</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Order Column</em>' containment reference.
- * @see #setOrderColumn(XmlOrderColumn)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable_2_0_OrderColumn()
- * @model containment="true"
- * @generated
- */
- public XmlOrderColumn getOrderColumn()
- {
- return orderColumn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetOrderColumn(XmlOrderColumn newOrderColumn, NotificationChain msgs)
- {
- XmlOrderColumn oldOrderColumn = orderColumn;
- orderColumn = newOrderColumn;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN, oldOrderColumn, newOrderColumn);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Order Column</em>' containment reference.
- * @see #getOrderColumn()
- * @generated
- */
- public void setOrderColumn(XmlOrderColumn newOrderColumn)
- {
- if (newOrderColumn != orderColumn)
- {
- NotificationChain msgs = null;
- if (orderColumn != null)
- msgs = ((InternalEObject)orderColumn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN, null, msgs);
- if (newOrderColumn != null)
- msgs = ((InternalEObject)newOrderColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN, null, msgs);
- msgs = basicSetOrderColumn(newOrderColumn, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN, newOrderColumn, newOrderColumn));
- }
-
- /**
* Returns the value of the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -453,8 +384,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
switch (featureID)
{
- case OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN:
- return basicSetOrderColumn(null, msgs);
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS:
return basicSetMapKeyClass(null, msgs);
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES:
@@ -477,8 +406,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
switch (featureID)
{
- case OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN:
- return getOrderColumn();
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS:
return getMapKeyClass();
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_TEMPORAL:
@@ -506,9 +433,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
switch (featureID)
{
- case OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN:
- setOrderColumn((XmlOrderColumn)newValue);
- return;
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS:
setMapKeyClass((XmlMapKeyClass)newValue);
return;
@@ -543,9 +467,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
switch (featureID)
{
- case OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN:
- setOrderColumn((XmlOrderColumn)null);
- return;
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS:
setMapKeyClass((XmlMapKeyClass)null);
return;
@@ -578,8 +499,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
{
switch (featureID)
{
- case OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN:
- return orderColumn != null;
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS:
return mapKeyClass != null;
case OrmPackage.XML_MANY_TO_MANY__MAP_KEY_TEMPORAL:
@@ -604,14 +523,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
@Override
public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
{
- if (baseClass == XmlOrderable_2_0.class)
- {
- switch (derivedFeatureID)
- {
- case OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN: return OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN;
- default: return -1;
- }
- }
if (baseClass == XmlManyToMany_2_0.class)
{
switch (derivedFeatureID)
@@ -636,14 +547,6 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement
@Override
public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
{
- if (baseClass == XmlOrderable_2_0.class)
- {
- switch (baseFeatureID)
- {
- case OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN: return OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN;
- default: return -1;
- }
- }
if (baseClass == XmlManyToMany_2_0.class)
{
switch (baseFeatureID)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
index 1cb32d8f51..17ae6b52e5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
@@ -77,16 +77,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
protected Boolean orphanRemoval = ORPHAN_REMOVAL_EDEFAULT;
/**
- * The cached value of the '{@link #getOrderColumn() <em>Order Column</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOrderColumn()
- * @generated
- * @ordered
- */
- protected XmlOrderColumn orderColumn;
-
- /**
* The cached value of the '{@link #getMapKeyClass() <em>Map Key Class</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -203,66 +193,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
}
/**
- * Returns the value of the '<em><b>Order Column</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Order Column</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Order Column</em>' containment reference.
- * @see #setOrderColumn(XmlOrderColumn)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable_2_0_OrderColumn()
- * @model containment="true"
- * @generated
- */
- public XmlOrderColumn getOrderColumn()
- {
- return orderColumn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetOrderColumn(XmlOrderColumn newOrderColumn, NotificationChain msgs)
- {
- XmlOrderColumn oldOrderColumn = orderColumn;
- orderColumn = newOrderColumn;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN, oldOrderColumn, newOrderColumn);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Order Column</em>' containment reference.
- * @see #getOrderColumn()
- * @generated
- */
- public void setOrderColumn(XmlOrderColumn newOrderColumn)
- {
- if (newOrderColumn != orderColumn)
- {
- NotificationChain msgs = null;
- if (orderColumn != null)
- msgs = ((InternalEObject)orderColumn).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN, null, msgs);
- if (newOrderColumn != null)
- msgs = ((InternalEObject)newOrderColumn).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN, null, msgs);
- msgs = basicSetOrderColumn(newOrderColumn, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN, newOrderColumn, newOrderColumn));
- }
-
- /**
* Returns the value of the '<em><b>Map Key Class</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -551,8 +481,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
{
case OrmPackage.XML_ONE_TO_MANY__JOIN_COLUMNS:
return ((InternalEList<?>)getJoinColumns()).basicRemove(otherEnd, msgs);
- case OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN:
- return basicSetOrderColumn(null, msgs);
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS:
return basicSetMapKeyClass(null, msgs);
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES:
@@ -579,8 +507,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
return getJoinColumns();
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
return getOrphanRemoval();
- case OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN:
- return getOrderColumn();
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS:
return getMapKeyClass();
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_TEMPORAL:
@@ -615,9 +541,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
setOrphanRemoval((Boolean)newValue);
return;
- case OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN:
- setOrderColumn((XmlOrderColumn)newValue);
- return;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS:
setMapKeyClass((XmlMapKeyClass)newValue);
return;
@@ -658,9 +581,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
setOrphanRemoval(ORPHAN_REMOVAL_EDEFAULT);
return;
- case OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN:
- setOrderColumn((XmlOrderColumn)null);
- return;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS:
setMapKeyClass((XmlMapKeyClass)null);
return;
@@ -697,8 +617,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
return joinColumns != null && !joinColumns.isEmpty();
case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL:
return ORPHAN_REMOVAL_EDEFAULT == null ? orphanRemoval != null : !ORPHAN_REMOVAL_EDEFAULT.equals(orphanRemoval);
- case OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN:
- return orderColumn != null;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS:
return mapKeyClass != null;
case OrmPackage.XML_ONE_TO_MANY__MAP_KEY_TEMPORAL:
@@ -739,14 +657,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
default: return -1;
}
}
- if (baseClass == XmlOrderable_2_0.class)
- {
- switch (derivedFeatureID)
- {
- case OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN: return OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN;
- default: return -1;
- }
- }
if (baseClass == XmlOneToMany_2_0.class)
{
switch (derivedFeatureID)
@@ -787,14 +697,6 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
default: return -1;
}
}
- if (baseClass == XmlOrderable_2_0.class)
- {
- switch (baseFeatureID)
- {
- case OrmV2_0Package.XML_ORDERABLE_20__ORDER_COLUMN: return OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN;
- default: return -1;
- }
- }
if (baseClass == XmlOneToMany_2_0.class)
{
switch (baseFeatureID)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOrderable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOrderable.java
new file mode 100644
index 0000000000..0cfbcbf2ab
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOrderable.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.core.resource.orm;
+
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrderable_2_0;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Orderable</b></em>'.
+ *
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.jpt.core.resource.orm.XmlOrderable#getOrderBy <em>Order By</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable()
+ * @model kind="class" interface="true" abstract="true"
+ * @generated
+ */
+public interface XmlOrderable extends XmlOrderable_2_0
+{
+ /**
+ * Returns the value of the '<em><b>Order By</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Order By</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Order By</em>' attribute.
+ * @see #setOrderBy(String)
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable_OrderBy()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ String getOrderBy();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable#getOrderBy <em>Order By</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Order By</em>' attribute.
+ * @see #getOrderBy()
+ * @generated
+ */
+ void setOrderBy(String value);
+
+} // XmlOrderable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
index 687f6cb035..0c5f17ab21 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
@@ -306,31 +306,31 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_ELEMENT_COLLECTION_20__ORDER_COLUMN = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Target Class</b></em>' attribute.
+ * The feature id for the '<em><b>Order By</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__TARGET_CLASS = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 1;
+ public static final int XML_ELEMENT_COLLECTION_20__ORDER_BY = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Fetch</b></em>' attribute.
+ * The feature id for the '<em><b>Target Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__FETCH = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 2;
+ public static final int XML_ELEMENT_COLLECTION_20__TARGET_CLASS = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Order By</b></em>' attribute.
+ * The feature id for the '<em><b>Fetch</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ELEMENT_COLLECTION_20__ORDER_BY = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 3;
+ public static final int XML_ELEMENT_COLLECTION_20__FETCH = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Map Key</b></em>' containment reference.
@@ -1807,21 +1807,6 @@ public class OrmV2_0Package extends EPackageImpl
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getOrderBy <em>Order By</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Order By</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getOrderBy()
- * @see #getXmlElementCollection_2_0()
- * @generated
- */
- public EAttribute getXmlElementCollection_2_0_OrderBy()
- {
- return (EAttribute)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(2);
- }
-
-
- /**
* Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKey <em>Map Key</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1832,7 +1817,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKey()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(3);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(2);
}
@@ -1847,7 +1832,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKeyClass()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(4);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(3);
}
@@ -1862,7 +1847,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EAttribute getXmlElementCollection_2_0_MapKeyTemporal()
{
- return (EAttribute)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(5);
+ return (EAttribute)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(4);
}
@@ -1877,7 +1862,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EAttribute getXmlElementCollection_2_0_MapKeyEnumerated()
{
- return (EAttribute)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(6);
+ return (EAttribute)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(5);
}
@@ -1892,7 +1877,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKeyAttributeOverrides()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(7);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(6);
}
@@ -1907,7 +1892,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKeyColumn()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(8);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(7);
}
@@ -1922,7 +1907,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_MapKeyJoinColumns()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(9);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(8);
}
@@ -1937,7 +1922,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_Column()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(10);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(9);
}
@@ -1952,7 +1937,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_AttributeOverrides()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(11);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(10);
}
@@ -1967,7 +1952,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_AssociationOverrides()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(12);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(11);
}
@@ -1982,7 +1967,7 @@ public class OrmV2_0Package extends EPackageImpl
*/
public EReference getXmlElementCollection_2_0_CollectionTable()
{
- return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(13);
+ return (EReference)xmlElementCollection_2_0EClass.getEStructuralFeatures().get(12);
}
@@ -2869,7 +2854,6 @@ public class OrmV2_0Package extends EPackageImpl
xmlElementCollection_2_0EClass = createEClass(XML_ELEMENT_COLLECTION_20);
createEAttribute(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__TARGET_CLASS);
createEAttribute(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__FETCH);
- createEAttribute(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__ORDER_BY);
createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY);
createEReference(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_CLASS);
createEAttribute(xmlElementCollection_2_0EClass, XML_ELEMENT_COLLECTION_20__MAP_KEY_TEMPORAL);
@@ -3000,7 +2984,7 @@ public class OrmV2_0Package extends EPackageImpl
// Add supertypes to classes
xmlAttributeMapping_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAccessHolder());
xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping());
- xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlOrderable_2_0());
+ xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlOrderable());
xmlEmbedded_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
xmlEntity_2_0EClass.getESuperTypes().add(this.getXmlCacheable_2_0());
xmlManyToMany_2_0EClass.getESuperTypes().add(this.getXmlOrderable_2_0());
@@ -3034,7 +3018,6 @@ public class OrmV2_0Package extends EPackageImpl
initEClass(xmlElementCollection_2_0EClass, XmlElementCollection_2_0.class, "XmlElementCollection_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlElementCollection_2_0_TargetClass(), theXMLTypePackage.getString(), "targetClass", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlElementCollection_2_0_Fetch(), theOrmPackage.getFetchType(), "fetch", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getXmlElementCollection_2_0_OrderBy(), theOrmPackage.getOrderBy(), "orderBy", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlElementCollection_2_0_MapKey(), theOrmPackage.getMapKey(), null, "mapKey", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getXmlElementCollection_2_0_MapKeyClass(), theOrmPackage.getXmlMapKeyClass(), null, "mapKeyClass", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getXmlElementCollection_2_0_MapKeyTemporal(), theOrmPackage.getTemporalType(), "mapKeyTemporal", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3295,14 +3278,6 @@ public class OrmV2_0Package extends EPackageImpl
public static final EAttribute XML_ELEMENT_COLLECTION_20__FETCH = eINSTANCE.getXmlElementCollection_2_0_Fetch();
/**
- * The meta object literal for the '<em><b>Order By</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute XML_ELEMENT_COLLECTION_20__ORDER_BY = eINSTANCE.getXmlElementCollection_2_0_OrderBy();
-
- /**
* The meta object literal for the '<em><b>Map Key</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java
index 4ba3c92a07..f933bc373d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.core.resource.orm.XmlColumn;
import org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping;
import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass;
+import org.eclipse.jpt.core.resource.orm.XmlOrderable;
import org.eclipse.jpt.core.utility.TextRange;
/**
@@ -35,7 +36,6 @@ import org.eclipse.jpt.core.utility.TextRange;
* <ul>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getTargetClass <em>Target Class</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getFetch <em>Fetch</em>}</li>
- * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getOrderBy <em>Order By</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKey <em>Map Key</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyClass <em>Map Key Class</em>}</li>
* <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
@@ -54,7 +54,7 @@ import org.eclipse.jpt.core.utility.TextRange;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrderable_2_0
+public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrderable
{
/**
* Returns the value of the '<em><b>Target Class</b></em>' attribute.
@@ -112,32 +112,6 @@ public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrde
void setFetch(FetchType value);
/**
- * Returns the value of the '<em><b>Order By</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Order By</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Order By</em>' attribute.
- * @see #setOrderBy(String)
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlElementCollection_2_0_OrderBy()
- * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
- * @generated
- */
- String getOrderBy();
-
- /**
- * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getOrderBy <em>Order By</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Order By</em>' attribute.
- * @see #getOrderBy()
- * @generated
- */
- void setOrderBy(String value);
-
- /**
* Returns the value of the '<em><b>Map Key</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>

Back to the top