+ * If the meaning of the 'Class Name' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Class Name' attribute. + * @see #setClassName(String) + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_ClassName() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * @generated + */ + public String getClassName() + { + return className; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType#getClassName Class Name}' attribute. + * + * + * @param value the new value of the 'Class Name' attribute. + * @see #getClassName() + * @generated + */ + public void setClassName(String newClassName) + { + String oldClassName = className; + className = newClassName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME, oldClassName, className)); + } + + /** + * Returns the value of the 'Description' attribute. + * + *+ * If the meaning of the 'Description' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Description' attribute. + * @see #setDescription(String) + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_Description() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getDescription() + { + return description; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType#getDescription Description}' attribute. + * + * + * @param value the new value of the 'Description' attribute. + * @see #getDescription() + * @generated + */ + public void setDescription(String newDescription) + { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION, oldDescription, description)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME: + return getClassName(); + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION: + return getDescription(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME: + setClassName((String)newValue); + return; + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION: + setDescription((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME: + setClassName(CLASS_NAME_EDEFAULT); + return; + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME: + return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className); + case OrmPackage.ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (className: "); + result.append(className); + result.append(", description: "); + result.append(description); + result.append(')'); + return result.toString(); + } + + + public TextRange getClassTextRange() { + return getAttributeTextRange(JPA.CLASS); + } + + + // ********** translators ********** + + protected static Translator buildDescriptionTranslator() { + return new Translator(JPA.DESCRIPTION, OrmPackage.eINSTANCE.getXmlManagedType_Description()); + } + + protected static Translator buildClassTranslator() { + return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlManagedType_ClassName(), Translator.DOM_ATTRIBUTE); + } + + + // ********** refactoring ********** + + public ReplaceEdit createRenameTypeEdit(IType originalType, String newName) { + String originalName = originalType.getTypeQualifiedName(); + int nameIndex = this.className.lastIndexOf(originalName); + int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote + return new ReplaceEdit(offset + nameIndex, originalName.length(), newName); + } + + public ReplaceEdit createRenamePackageEdit(String newPackageName) { + int packageLength = this.className.lastIndexOf('.'); + if (newPackageName == "") {//$NON-NLS-1$ + //moving to the default package, remove the '.' + packageLength++; + } + if (packageLength == -1) { + //moving from the default package or unspecified package + packageLength = 0; + newPackageName = newPackageName + '.'; + } + int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote + return new ReplaceEdit(offset, packageLength, newPackageName); + } + + // *********** content assist ************ + + protected TextRange getClassNameCodeAssistTextRange() { + return getAttributeCodeAssistTextRange(JPA.CLASS); + } + + public boolean classNameTouches(int pos) { + TextRange textRange = this.getClassNameCodeAssistTextRange(); + return (textRange != null) && (textRange.touches(pos)); + } +} // AbstractXmlManagedType diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java index 5f8d393c8e..4bbca77034 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/AbstractXmlTypeMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -14,10 +14,7 @@ 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.jdt.core.IType; -import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -36,7 +33,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" abstract="true" * @generated */ -public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements XmlTypeMapping +public abstract class AbstractXmlTypeMapping extends AbstractXmlManagedType implements XmlTypeMapping { /** @@ -59,26 +56,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements */ protected String access = ACCESS_EDEFAULT; - /** - * The default value of the '{@link #getClassName() Class Name}' attribute. - * - * - * @see #getClassName() - * @generated - * @ordered - */ - protected static final String CLASS_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getClassName() Class Name}' attribute. - * - * - * @see #getClassName() - * @generated - * @ordered - */ - protected String className = CLASS_NAME_EDEFAULT; - /** * The default value of the '{@link #getMetadataComplete() Metadata Complete}' attribute. * @@ -99,26 +76,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements */ protected Boolean metadataComplete = METADATA_COMPLETE_EDEFAULT; - /** - * The default value of the '{@link #getDescription() Description}' attribute. - * - * - * @see #getDescription() - * @generated - * @ordered - */ - protected static final String DESCRIPTION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getDescription() Description}' attribute. - * - * - * @see #getDescription() - * @generated - * @ordered - */ - protected String description = DESCRIPTION_EDEFAULT; - /** * The cached value of the '{@link #getAttributes() Attributes}' containment reference. * @@ -150,41 +107,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements return OrmPackage.Literals.ABSTRACT_XML_TYPE_MAPPING; } - /** - * Returns the value of the 'Class Name' attribute. - * - *- * If the meaning of the 'Class Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Class Name' attribute. - * @see #setClassName(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_ClassName() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" - * @generated - */ - public String getClassName() - { - return className; - } - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping#getClassName Class Name}' attribute. - * - * - * @param value the new value of the 'Class Name' attribute. - * @see #getClassName() - * @generated - */ - public void setClassName(String newClassName) - { - String oldClassName = className; - className = newClassName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME, oldClassName, className)); - } - /** * Returns the value of the 'Access' attribute. * @@ -255,41 +177,6 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE, oldMetadataComplete, metadataComplete)); } - /** - * Returns the value of the 'Description' attribute. - * - *- * If the meaning of the 'Description' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Description' attribute. - * @see #setDescription(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_Description() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * @generated - */ - public String getDescription() - { - return description; - } - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping#getDescription Description}' attribute. - * - * - * @param value the new value of the 'Description' attribute. - * @see #getDescription() - * @generated - */ - public void setDescription(String newDescription) - { - String oldDescription = description; - description = newDescription; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION, oldDescription, description)); - } - /** * Returns the value of the 'Attributes' containment reference. * @@ -378,12 +265,8 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements { case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS: return getAccess(); - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME: - return getClassName(); case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE: return getMetadataComplete(); - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION: - return getDescription(); case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES: return getAttributes(); } @@ -403,15 +286,9 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS: setAccess((String)newValue); return; - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME: - setClassName((String)newValue); - return; case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE: setMetadataComplete((Boolean)newValue); return; - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION: - setDescription((String)newValue); - return; case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES: setAttributes((Attributes)newValue); return; @@ -432,15 +309,9 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS: setAccess(ACCESS_EDEFAULT); return; - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME: - setClassName(CLASS_NAME_EDEFAULT); - return; case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE: setMetadataComplete(METADATA_COMPLETE_EDEFAULT); return; - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES: setAttributes((Attributes)null); return; @@ -460,18 +331,70 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements { case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS: return ACCESS_EDEFAULT == null ? access != null : !ACCESS_EDEFAULT.equals(access); - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME: - return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className); case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE: return METADATA_COMPLETE_EDEFAULT == null ? metadataComplete != null : !METADATA_COMPLETE_EDEFAULT.equals(metadataComplete); - case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES: return attributes != null; } return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) + { + if (baseClass == XmlAccessHolder.class) + { + switch (derivedFeatureID) + { + case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS: return OrmPackage.XML_ACCESS_HOLDER__ACCESS; + default: return -1; + } + } + if (baseClass == XmlTypeMapping.class) + { + switch (derivedFeatureID) + { + case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE: return OrmPackage.XML_TYPE_MAPPING__METADATA_COMPLETE; + case OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES: return OrmPackage.XML_TYPE_MAPPING__ATTRIBUTES; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) + { + if (baseClass == XmlAccessHolder.class) + { + switch (baseFeatureID) + { + case OrmPackage.XML_ACCESS_HOLDER__ACCESS: return OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ACCESS; + default: return -1; + } + } + if (baseClass == XmlTypeMapping.class) + { + switch (baseFeatureID) + { + case OrmPackage.XML_TYPE_MAPPING__METADATA_COMPLETE: return OrmPackage.ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; + case OrmPackage.XML_TYPE_MAPPING__ATTRIBUTES: return OrmPackage.ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + /** * * @@ -485,21 +408,13 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements StringBuffer result = new StringBuffer(super.toString()); result.append(" (access: "); result.append(access); - result.append(", className: "); - result.append(className); result.append(", metadataComplete: "); result.append(metadataComplete); - result.append(", description: "); - result.append(description); result.append(')'); return result.toString(); } - public TextRange getClassTextRange() { - return getAttributeTextRange(JPA.CLASS); - } - public TextRange getAttributesTextRange() { return getAttributeTextRange(JPA.ATTRIBUTES); } @@ -510,18 +425,10 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements // ********** translators ********** - protected static Translator buildClassTranslator() { - return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlTypeMapping_ClassName(), Translator.DOM_ATTRIBUTE); - } - protected static Translator buildMetadataCompleteTranslator() { return new Translator(JPA.METADATA_COMPLETE, OrmPackage.eINSTANCE.getXmlTypeMapping_MetadataComplete(), Translator.DOM_ATTRIBUTE); } - protected static Translator buildDescriptionTranslator() { - return new Translator(JPA.DESCRIPTION, OrmPackage.eINSTANCE.getXmlTypeMapping_Description()); - } - protected static Translator buildAttributesTranslator() { return Attributes.buildTranslator(); } @@ -530,39 +437,4 @@ public abstract class AbstractXmlTypeMapping extends EBaseObjectImpl implements return new Translator(JPA.ACCESS, OrmPackage.eINSTANCE.getXmlAccessHolder_Access(), Translator.DOM_ATTRIBUTE); } - - // ********** refactoring ********** - - public ReplaceEdit createRenameTypeEdit(IType originalType, String newName) { - String originalName = originalType.getTypeQualifiedName(); - int nameIndex = this.className.lastIndexOf(originalName); - int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote - return new ReplaceEdit(offset + nameIndex, originalName.length(), newName); - } - - public ReplaceEdit createRenamePackageEdit(String newPackageName) { - int packageLength = this.className.lastIndexOf('.'); - if (newPackageName == "") {//$NON-NLS-1$ - //moving to the default package, remove the '.' - packageLength++; - } - if (packageLength == -1) { - //moving from the default package or unspecified package - packageLength = 0; - newPackageName = newPackageName + '.'; - } - int offset = getAttributeNode(JPA.CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote - return new ReplaceEdit(offset, packageLength, newPackageName); - } - - // *********** content assist ************ - - protected TextRange getClassNameCodeAssistTextRange() { - return getAttributeCodeAssistTextRange(JPA.CLASS); - } - - public boolean classNameTouches(int pos) { - TextRange textRange = this.getClassNameCodeAssistTextRange(); - return (textRange != null) && (textRange.touches(pos)); - } } // TypeMapping diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java index b3f35a5c98..1820beec7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/OrmPackage.java @@ -80,7 +80,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAccessHolder() * @generated */ - public static final int XML_ACCESS_HOLDER = 15; + public static final int XML_ACCESS_HOLDER = 16; /** * The feature id for the 'Access' attribute. @@ -108,7 +108,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeMapping() * @generated */ - public static final int XML_ATTRIBUTE_MAPPING = 16; + public static final int XML_ATTRIBUTE_MAPPING = 17; /** * The feature id for the 'Access' attribute. @@ -301,7 +301,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlNamedColumn() * @generated */ - public static final int ABSTRACT_XML_NAMED_COLUMN = 9; + public static final int ABSTRACT_XML_NAMED_COLUMN = 10; /** * The feature id for the 'Column Definition' attribute. @@ -521,7 +521,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlRelationshipMapping() * @generated */ - public static final int ABSTRACT_XML_RELATIONSHIP_MAPPING = 10; + public static final int ABSTRACT_XML_RELATIONSHIP_MAPPING = 11; /** * The feature id for the 'Access' attribute. @@ -841,6 +841,80 @@ public class OrmPackage extends EPackageImpl */ public static final int XML_BASE_JOIN_COLUMN_FEATURE_COUNT = XML_NAMED_COLUMN_FEATURE_COUNT + 1; + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType Xml Managed Type}' class. + * + * + * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType() + * @generated + */ + public static final int XML_MANAGED_TYPE = 60; + + /** + * The feature id for the 'Class Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_MANAGED_TYPE__CLASS_NAME = 0; + + /** + * The feature id for the 'Description' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_MANAGED_TYPE__DESCRIPTION = 1; + + /** + * The number of structural features of the 'Xml Managed Type' class. + * + * + * @generated + * @ordered + */ + public static final int XML_MANAGED_TYPE_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType Abstract Xml Managed Type}' class. + * + * + * @see org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlManagedType() + * @generated + */ + public static final int ABSTRACT_XML_MANAGED_TYPE = 9; + + /** + * The feature id for the 'Class Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME = XML_MANAGED_TYPE__CLASS_NAME; + + /** + * The feature id for the 'Description' attribute. + * + * + * @generated + * @ordered + */ + public static final int ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION = XML_MANAGED_TYPE__DESCRIPTION; + + /** + * The number of structural features of the 'Abstract Xml Managed Type' class. + * + * + * @generated + * @ordered + */ + public static final int ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT = XML_MANAGED_TYPE_FEATURE_COUNT + 0; + /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlSingleRelationshipMapping Abstract Xml Single Relationship Mapping}' class. * @@ -849,7 +923,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlSingleRelationshipMapping() * @generated */ - public static final int ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING = 11; + public static final int ABSTRACT_XML_SINGLE_RELATIONSHIP_MAPPING = 12; /** * The feature id for the 'Access' attribute. @@ -958,7 +1032,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlTable() * @generated */ - public static final int ABSTRACT_XML_TABLE = 13; + public static final int ABSTRACT_XML_TABLE = 14; /** * The feature id for the 'Name' attribute. @@ -1013,7 +1087,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping() * @generated */ - public static final int XML_TYPE_MAPPING = 98; + public static final int XML_TYPE_MAPPING = 100; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlTypeMapping Abstract Xml Type Mapping}' class. @@ -1023,7 +1097,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlTypeMapping() * @generated */ - public static final int ABSTRACT_XML_TYPE_MAPPING = 14; + public static final int ABSTRACT_XML_TYPE_MAPPING = 15; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride Xml Association Override}' class. @@ -1033,7 +1107,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverride() * @generated */ - public static final int XML_ASSOCIATION_OVERRIDE = 17; + public static final int XML_ASSOCIATION_OVERRIDE = 18; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer Xml Association Override Container}' class. @@ -1043,7 +1117,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAssociationOverrideContainer() * @generated */ - public static final int XML_ASSOCIATION_OVERRIDE_CONTAINER = 18; + public static final int XML_ASSOCIATION_OVERRIDE_CONTAINER = 19; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride Xml Attribute Override}' class. @@ -1053,7 +1127,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeOverride() * @generated */ - public static final int XML_ATTRIBUTE_OVERRIDE = 19; + public static final int XML_ATTRIBUTE_OVERRIDE = 20; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer Xml Attribute Override Container}' class. @@ -1063,7 +1137,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlAttributeOverrideContainer() * @generated */ - public static final int XML_ATTRIBUTE_OVERRIDE_CONTAINER = 20; + public static final int XML_ATTRIBUTE_OVERRIDE_CONTAINER = 21; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Attributes Attributes}' class. @@ -1073,7 +1147,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAttributes() * @generated */ - public static final int ATTRIBUTES = 21; + public static final int ATTRIBUTES = 22; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlBasic Xml Basic}' class. @@ -1083,7 +1157,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlBasic() * @generated */ - public static final int XML_BASIC = 22; + public static final int XML_BASIC = 23; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.CascadeType Cascade Type}' class. @@ -1093,7 +1167,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getCascadeType() * @generated */ - public static final int CASCADE_TYPE = 23; + public static final int CASCADE_TYPE = 24; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlReferenceTable Abstract Xml Reference Table}' class. @@ -1103,7 +1177,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlReferenceTable() * @generated */ - public static final int ABSTRACT_XML_REFERENCE_TABLE = 12; + public static final int ABSTRACT_XML_REFERENCE_TABLE = 13; /** * The feature id for the 'Name' attribute. @@ -1159,15 +1233,6 @@ public class OrmPackage extends EPackageImpl */ public static final int ABSTRACT_XML_REFERENCE_TABLE_FEATURE_COUNT = ABSTRACT_XML_TABLE_FEATURE_COUNT + 1; - /** - * The feature id for the 'Access' attribute. - * - * - * @generated - * @ordered - */ - public static final int XML_TYPE_MAPPING__ACCESS = XML_ACCESS_HOLDER__ACCESS; - /** * The feature id for the 'Class Name' attribute. * @@ -1175,16 +1240,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_TYPE_MAPPING__CLASS_NAME = XML_ACCESS_HOLDER_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Metadata Complete' attribute. - * - * - * @generated - * @ordered - */ - public static final int XML_TYPE_MAPPING__METADATA_COMPLETE = XML_ACCESS_HOLDER_FEATURE_COUNT + 1; + public static final int ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME = ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME; /** * The feature id for the 'Description' attribute. @@ -1193,25 +1249,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_TYPE_MAPPING__DESCRIPTION = XML_ACCESS_HOLDER_FEATURE_COUNT + 2; - - /** - * The feature id for the 'Attributes' containment reference. - * - * - * @generated - * @ordered - */ - public static final int XML_TYPE_MAPPING__ATTRIBUTES = XML_ACCESS_HOLDER_FEATURE_COUNT + 3; - - /** - * The number of structural features of the 'Xml Type Mapping' class. - * - * - * @generated - * @ordered - */ - public static final int XML_TYPE_MAPPING_FEATURE_COUNT = XML_ACCESS_HOLDER_FEATURE_COUNT + 4; + public static final int ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION = ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION; /** * The feature id for the 'Access' attribute. @@ -1220,16 +1258,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int ABSTRACT_XML_TYPE_MAPPING__ACCESS = XML_TYPE_MAPPING__ACCESS; - - /** - * The feature id for the 'Class Name' attribute. - * - * - * @generated - * @ordered - */ - public static final int ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME = XML_TYPE_MAPPING__CLASS_NAME; + public static final int ABSTRACT_XML_TYPE_MAPPING__ACCESS = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 0; /** * The feature id for the 'Metadata Complete' attribute. @@ -1238,16 +1267,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE = XML_TYPE_MAPPING__METADATA_COMPLETE; - - /** - * The feature id for the 'Description' attribute. - * - * - * @generated - * @ordered - */ - public static final int ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION = XML_TYPE_MAPPING__DESCRIPTION; + public static final int ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 1; /** * The feature id for the 'Attributes' containment reference. @@ -1256,7 +1276,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES = XML_TYPE_MAPPING__ATTRIBUTES; + public static final int ABSTRACT_XML_TYPE_MAPPING__ATTRIBUTES = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 2; /** * The number of structural features of the 'Abstract Xml Type Mapping' class. @@ -1265,7 +1285,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT = XML_TYPE_MAPPING_FEATURE_COUNT + 0; + public static final int ABSTRACT_XML_TYPE_MAPPING_FEATURE_COUNT = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOverride Xml Override}' class. @@ -1275,7 +1295,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOverride() * @generated */ - public static final int XML_OVERRIDE = 75; + public static final int XML_OVERRIDE = 77; /** * The feature id for the 'Name' attribute. @@ -1699,7 +1719,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlClassReference() * @generated */ - public static final int XML_CLASS_REFERENCE = 24; + public static final int XML_CLASS_REFERENCE = 25; /** * The feature id for the 'Class Name' attribute. @@ -1727,7 +1747,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlCollectionTable() * @generated */ - public static final int XML_COLLECTION_TABLE = 25; + public static final int XML_COLLECTION_TABLE = 26; /** * The feature id for the 'Name' attribute. @@ -1809,7 +1829,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlColumn() * @generated */ - public static final int XML_COLUMN = 26; + public static final int XML_COLUMN = 27; /** * The feature id for the 'Column Definition' attribute. @@ -1918,7 +1938,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnMapping() * @generated */ - public static final int COLUMN_MAPPING = 27; + public static final int COLUMN_MAPPING = 28; /** * The feature id for the 'Column' containment reference. @@ -1946,7 +1966,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getColumnResult() * @generated */ - public static final int COLUMN_RESULT = 28; + public static final int COLUMN_RESULT = 29; /** * The feature id for the 'Class Name' attribute. @@ -1983,7 +2003,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getConstructorResult() * @generated */ - public static final int CONSTRUCTOR_RESULT = 29; + public static final int CONSTRUCTOR_RESULT = 30; /** * The feature id for the 'Target Class' attribute. @@ -2020,7 +2040,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvert() * @generated */ - public static final int XML_CONVERT = 30; + public static final int XML_CONVERT = 31; /** * The feature id for the 'Description' attribute. @@ -2075,25 +2095,25 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter() * @generated */ - public static final int XML_CONVERTER = 31; + public static final int XML_CONVERTER = 32; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Class Name' attribute. * * * @generated * @ordered */ - public static final int XML_CONVERTER__DESCRIPTION = OrmV2_1Package.XML_CONVERTER_21__DESCRIPTION; + public static final int XML_CONVERTER__CLASS_NAME = ABSTRACT_XML_MANAGED_TYPE__CLASS_NAME; /** - * The feature id for the 'Class Name' attribute. + * The feature id for the 'Description' attribute. * * * @generated * @ordered */ - public static final int XML_CONVERTER__CLASS_NAME = OrmV2_1Package.XML_CONVERTER_21__CLASS_NAME; + public static final int XML_CONVERTER__DESCRIPTION = ABSTRACT_XML_MANAGED_TYPE__DESCRIPTION; /** * The feature id for the 'Auto Apply' attribute. @@ -2102,7 +2122,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_CONVERTER__AUTO_APPLY = OrmV2_1Package.XML_CONVERTER_21__AUTO_APPLY; + public static final int XML_CONVERTER__AUTO_APPLY = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 0; /** * The number of structural features of the 'Xml Converter' class. @@ -2111,7 +2131,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_CONVERTER_FEATURE_COUNT = OrmV2_1Package.XML_CONVERTER_21_FEATURE_COUNT + 0; + public static final int XML_CONVERTER_FEATURE_COUNT = ABSTRACT_XML_MANAGED_TYPE_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping Xml Convertible Mapping}' class. @@ -2121,7 +2141,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConvertibleMapping() * @generated */ - public static final int XML_CONVERTIBLE_MAPPING = 32; + public static final int XML_CONVERTIBLE_MAPPING = 33; /** * The feature id for the 'Convert' containment reference. @@ -2176,7 +2196,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlDiscriminatorColumn() * @generated */ - public static final int XML_DISCRIMINATOR_COLUMN = 33; + public static final int XML_DISCRIMINATOR_COLUMN = 34; /** * The feature id for the 'Column Definition' attribute. @@ -2231,7 +2251,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlElementCollection() * @generated */ - public static final int XML_ELEMENT_COLLECTION = 34; + public static final int XML_ELEMENT_COLLECTION = 35; /** * The feature id for the 'Access' attribute. @@ -2466,43 +2486,43 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbeddable() * @generated */ - public static final int XML_EMBEDDABLE = 35; + public static final int XML_EMBEDDABLE = 36; /** - * The feature id for the 'Access' attribute. + * The feature id for the 'Class Name' attribute. * * * @generated * @ordered */ - public static final int XML_EMBEDDABLE__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS; + public static final int XML_EMBEDDABLE__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME; /** - * The feature id for the 'Class Name' attribute. + * The feature id for the 'Description' attribute. * * * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME; + public static final int XML_EMBEDDABLE__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION; /** - * The feature id for the 'Metadata Complete' attribute. + * The feature id for the 'Access' attribute. * * * @generated * @ordered */ - public static final int XML_EMBEDDABLE__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; + public static final int XML_EMBEDDABLE__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Metadata Complete' attribute. * * * @generated * @ordered */ - public static final int XML_EMBEDDABLE__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION; + public static final int XML_EMBEDDABLE__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; /** * The feature id for the 'Attributes' containment reference. @@ -2530,7 +2550,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbedded() * @generated */ - public static final int XML_EMBEDDED = 36; + public static final int XML_EMBEDDED = 37; /** * The feature id for the 'Access' attribute. @@ -2594,7 +2614,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEmbeddedId() * @generated */ - public static final int XML_EMBEDDED_ID = 37; + public static final int XML_EMBEDDED_ID = 38; /** * The feature id for the 'Access' attribute. @@ -2640,43 +2660,43 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntity() * @generated */ - public static final int XML_ENTITY = 38; + public static final int XML_ENTITY = 39; /** - * The feature id for the 'Access' attribute. + * The feature id for the 'Class Name' attribute. * * * @generated * @ordered */ - public static final int XML_ENTITY__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS; + public static final int XML_ENTITY__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME; /** - * The feature id for the 'Class Name' attribute. + * The feature id for the 'Description' attribute. * * * @generated * @ordered */ - public static final int XML_ENTITY__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME; + public static final int XML_ENTITY__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION; /** - * The feature id for the 'Metadata Complete' attribute. + * The feature id for the 'Access' attribute. * * * @generated * @ordered */ - public static final int XML_ENTITY__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; + public static final int XML_ENTITY__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Metadata Complete' attribute. * * * @generated * @ordered */ - public static final int XML_ENTITY__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION; + public static final int XML_ENTITY__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; /** * The feature id for the 'Attributes' containment reference. @@ -2974,7 +2994,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEventMethodContainer() * @generated */ - public static final int XML_EVENT_METHOD_CONTAINER = 44; + public static final int XML_EVENT_METHOD_CONTAINER = 45; /** * The feature id for the 'Pre Persist' containment reference. @@ -3056,7 +3076,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListener() * @generated */ - public static final int ENTITY_LISTENER = 39; + public static final int ENTITY_LISTENER = 40; /** * The feature id for the 'Pre Persist' containment reference. @@ -3156,7 +3176,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityListeners() * @generated */ - public static final int ENTITY_LISTENERS = 40; + public static final int ENTITY_LISTENERS = 41; /** * The feature id for the 'Entity Listeners' containment reference list. @@ -3184,7 +3204,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlEntityMappings() * @generated */ - public static final int XML_ENTITY_MAPPINGS = 41; + public static final int XML_ENTITY_MAPPINGS = 42; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EntityResult Entity Result}' class. @@ -3194,7 +3214,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEntityResult() * @generated */ - public static final int ENTITY_RESULT = 42; + public static final int ENTITY_RESULT = 43; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EventMethod Event Method}' class. @@ -3204,7 +3224,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEventMethod() * @generated */ - public static final int EVENT_METHOD = 43; + public static final int EVENT_METHOD = 44; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.FieldResult Field Result}' class. @@ -3214,7 +3234,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFieldResult() * @generated */ - public static final int FIELD_RESULT = 45; + public static final int FIELD_RESULT = 46; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue Xml Generated Value}' class. @@ -3224,7 +3244,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratedValue() * @generated */ - public static final int XML_GENERATED_VALUE = 47; + public static final int XML_GENERATED_VALUE = 48; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator Xml Generator}' class. @@ -3234,7 +3254,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGenerator() * @generated */ - public static final int XML_GENERATOR = 48; + public static final int XML_GENERATOR = 49; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer Xml Generator Container}' class. @@ -3244,7 +3264,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlGeneratorContainer() * @generated */ - public static final int XML_GENERATOR_CONTAINER = 49; + public static final int XML_GENERATOR_CONTAINER = 50; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlId Xml Id}' class. @@ -3254,7 +3274,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlId() * @generated */ - public static final int XML_ID = 50; + public static final int XML_ID = 51; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Inheritance Inheritance}' class. @@ -3264,7 +3284,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritance() * @generated */ - public static final int INHERITANCE = 53; + public static final int INHERITANCE = 54; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn Xml Join Column}' class. @@ -3274,7 +3294,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumn() * @generated */ - public static final int XML_JOIN_COLUMN = 54; + public static final int XML_JOIN_COLUMN = 55; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable Xml Join Table}' class. @@ -3284,7 +3304,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTable() * @generated */ - public static final int XML_JOIN_TABLE = 56; + public static final int XML_JOIN_TABLE = 57; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.Lob Lob}' class. @@ -3294,7 +3314,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getLob() * @generated */ - public static final int LOB = 58; + public static final int LOB = 59; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany Xml Many To Many}' class. @@ -3304,7 +3324,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToMany() * @generated */ - public static final int XML_MANY_TO_MANY = 59; + public static final int XML_MANY_TO_MANY = 61; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne Xml Many To One}' class. @@ -3314,7 +3334,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManyToOne() * @generated */ - public static final int XML_MANY_TO_ONE = 60; + public static final int XML_MANY_TO_ONE = 62; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.MapKey Map Key}' class. @@ -3324,7 +3344,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getMapKey() * @generated */ - public static final int MAP_KEY = 61; + public static final int MAP_KEY = 63; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlMappedByMapping Xml Mapped By Mapping}' class. @@ -3334,7 +3354,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedByMapping() * @generated */ - public static final int XML_MAPPED_BY_MAPPING = 62; + public static final int XML_MAPPED_BY_MAPPING = 64; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass Xml Mapped Superclass}' class. @@ -3344,7 +3364,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlMappedSuperclass() * @generated */ - public static final int XML_MAPPED_SUPERCLASS = 63; + public static final int XML_MAPPED_SUPERCLASS = 65; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQuery Xml Query}' class. @@ -3354,7 +3374,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQuery() * @generated */ - public static final int XML_QUERY = 88; + public static final int XML_QUERY = 90; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery Xml Named Native Query}' class. @@ -3364,7 +3384,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedNativeQuery() * @generated */ - public static final int XML_NAMED_NATIVE_QUERY = 67; + public static final int XML_NAMED_NATIVE_QUERY = 69; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery Xml Named Query}' class. @@ -3374,7 +3394,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedQuery() * @generated */ - public static final int XML_NAMED_QUERY = 68; + public static final int XML_NAMED_QUERY = 70; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping Xml Null Attribute Mapping}' class. @@ -3384,7 +3404,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNullAttributeMapping() * @generated */ - public static final int XML_NULL_ATTRIBUTE_MAPPING = 70; + public static final int XML_NULL_ATTRIBUTE_MAPPING = 72; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany Xml One To Many}' class. @@ -3394,7 +3414,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToMany() * @generated */ - public static final int XML_ONE_TO_MANY = 71; + public static final int XML_ONE_TO_MANY = 73; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne Xml One To One}' class. @@ -3404,7 +3424,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOneToOne() * @generated */ - public static final int XML_ONE_TO_ONE = 72; + public static final int XML_ONE_TO_ONE = 74; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn Xml Order Column}' class. @@ -3414,7 +3434,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOrderColumn() * @generated */ - public static final int XML_ORDER_COLUMN = 74; + public static final int XML_ORDER_COLUMN = 76; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults Xml Persistence Unit Defaults}' class. @@ -3424,7 +3444,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults() * @generated */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 76; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 78; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata Xml Persistence Unit Metadata}' class. @@ -3434,7 +3454,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata() * @generated */ - public static final int XML_PERSISTENCE_UNIT_METADATA = 77; + public static final int XML_PERSISTENCE_UNIT_METADATA = 79; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostLoad Post Load}' class. @@ -3444,7 +3464,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostLoad() * @generated */ - public static final int POST_LOAD = 79; + public static final int POST_LOAD = 81; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostPersist Post Persist}' class. @@ -3454,7 +3474,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostPersist() * @generated */ - public static final int POST_PERSIST = 80; + public static final int POST_PERSIST = 82; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostRemove Post Remove}' class. @@ -3464,7 +3484,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostRemove() * @generated */ - public static final int POST_REMOVE = 81; + public static final int POST_REMOVE = 83; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PostUpdate Post Update}' class. @@ -3474,7 +3494,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPostUpdate() * @generated */ - public static final int POST_UPDATE = 82; + public static final int POST_UPDATE = 84; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PrePersist Pre Persist}' class. @@ -3484,7 +3504,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPrePersist() * @generated */ - public static final int PRE_PERSIST = 83; + public static final int PRE_PERSIST = 85; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PreRemove Pre Remove}' class. @@ -3494,7 +3514,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPreRemove() * @generated */ - public static final int PRE_REMOVE = 84; + public static final int PRE_REMOVE = 86; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.PreUpdate Pre Update}' class. @@ -3504,7 +3524,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getPreUpdate() * @generated */ - public static final int PRE_UPDATE = 85; + public static final int PRE_UPDATE = 87; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn Xml Primary Key Join Column}' class. @@ -3514,7 +3534,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn() * @generated */ - public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 86; + public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 88; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryContainer Xml Query Container}' class. @@ -3524,7 +3544,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryContainer() * @generated */ - public static final int XML_QUERY_CONTAINER = 89; + public static final int XML_QUERY_CONTAINER = 91; /** * The feature id for the 'Version' attribute. @@ -3804,7 +3824,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlForeignKey() * @generated */ - public static final int XML_FOREIGN_KEY = 46; + public static final int XML_FOREIGN_KEY = 47; /** * The feature id for the 'Description' attribute. @@ -4057,7 +4077,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIdClassContainer() * @generated */ - public static final int XML_ID_CLASS_CONTAINER = 51; + public static final int XML_ID_CLASS_CONTAINER = 52; /** * The feature id for the 'Id Class' containment reference. @@ -4085,7 +4105,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlIndex() * @generated */ - public static final int XML_INDEX = 52; + public static final int XML_INDEX = 53; /** * The feature id for the 'Description' attribute. @@ -4239,7 +4259,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinColumnContainer() * @generated */ - public static final int XML_JOIN_COLUMN_CONTAINER = 55; + public static final int XML_JOIN_COLUMN_CONTAINER = 56; /** * The feature id for the 'Join Columns' containment reference list. @@ -4267,7 +4287,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlReferenceTable() * @generated */ - public static final int XML_REFERENCE_TABLE = 78; + public static final int XML_REFERENCE_TABLE = 80; /** * The feature id for the 'Name' attribute. @@ -4367,7 +4387,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlJoinTableContainer() * @generated */ - public static final int XML_JOIN_TABLE_CONTAINER = 57; + public static final int XML_JOIN_TABLE_CONTAINER = 58; /** * The feature id for the 'Join Table' containment reference. @@ -4712,40 +4732,40 @@ public class OrmPackage extends EPackageImpl public static final int XML_MAPPED_BY_MAPPING_FEATURE_COUNT = 1; /** - * The feature id for the 'Access' attribute. + * The feature id for the 'Class Name' attribute. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS; + public static final int XML_MAPPED_SUPERCLASS__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME; /** - * The feature id for the 'Class Name' attribute. + * The feature id for the 'Description' attribute. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CLASS_NAME = ABSTRACT_XML_TYPE_MAPPING__CLASS_NAME; + public static final int XML_MAPPED_SUPERCLASS__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION; /** - * The feature id for the 'Metadata Complete' attribute. + * The feature id for the 'Access' attribute. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; + public static final int XML_MAPPED_SUPERCLASS__ACCESS = ABSTRACT_XML_TYPE_MAPPING__ACCESS; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Metadata Complete' attribute. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__DESCRIPTION = ABSTRACT_XML_TYPE_MAPPING__DESCRIPTION; + public static final int XML_MAPPED_SUPERCLASS__METADATA_COMPLETE = ABSTRACT_XML_TYPE_MAPPING__METADATA_COMPLETE; /** * The feature id for the 'Attributes' containment reference. @@ -4809,7 +4829,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedAttributeNode() * @generated */ - public static final int XML_NAMED_ATTRIBUTE_NODE = 64; + public static final int XML_NAMED_ATTRIBUTE_NODE = 66; /** * The feature id for the 'Name' attribute. @@ -4855,7 +4875,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedEntityGraph() * @generated */ - public static final int XML_NAMED_ENTITY_GRAPH = 65; + public static final int XML_NAMED_ENTITY_GRAPH = 67; /** * The feature id for the 'Named Attribute Nodes' containment reference list. @@ -4919,7 +4939,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedSubgraph() * @generated */ - public static final int XML_NAMED_SUBGRAPH = 66; + public static final int XML_NAMED_SUBGRAPH = 68; /** * The feature id for the 'Named Attribute Nodes' containment reference list. @@ -5118,7 +5138,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlNamedStoredProcedureQuery() * @generated */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 69; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 71; /** * The feature id for the 'Description' attribute. @@ -5127,7 +5147,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = XML_QUERY__DESCRIPTION; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__DESCRIPTION = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__DESCRIPTION; /** * The feature id for the 'Name' attribute. @@ -5136,7 +5156,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = XML_QUERY__NAME; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__NAME; /** * The feature id for the 'Hints' containment reference list. @@ -5145,7 +5165,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = XML_QUERY__HINTS; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__HINTS; /** * The feature id for the 'Result Classes' attribute list. @@ -5154,7 +5174,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = XML_QUERY_FEATURE_COUNT + 0; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES; /** * The feature id for the 'Result Set Mappings' attribute list. @@ -5163,7 +5183,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = XML_QUERY_FEATURE_COUNT + 1; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS; /** * The feature id for the 'Procedure Name' attribute. @@ -5172,7 +5192,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = XML_QUERY_FEATURE_COUNT + 2; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME; /** * The feature id for the 'Parameters' containment reference list. @@ -5181,7 +5201,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = XML_QUERY_FEATURE_COUNT + 3; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS; /** * The number of structural features of the 'Xml Named Stored Procedure Query' class. @@ -5190,7 +5210,7 @@ public class OrmPackage extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = XML_QUERY_FEATURE_COUNT + 4; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter Xml Stored Procedure Parameter}' class. @@ -5200,7 +5220,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter() * @generated */ - public static final int XML_STORED_PROCEDURE_PARAMETER = 94; + public static final int XML_STORED_PROCEDURE_PARAMETER = 96; /** * The feature id for the 'Access' attribute. @@ -5588,7 +5608,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlQueryHint() * @generated */ - public static final int XML_QUERY_HINT = 90; + public static final int XML_QUERY_HINT = 92; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSecondaryTable Xml Secondary Table}' class. @@ -5598,7 +5618,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSecondaryTable() * @generated */ - public static final int XML_SECONDARY_TABLE = 91; + public static final int XML_SECONDARY_TABLE = 93; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator Xml Sequence Generator}' class. @@ -5608,7 +5628,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSequenceGenerator() * @generated */ - public static final int XML_SEQUENCE_GENERATOR = 92; + public static final int XML_SEQUENCE_GENERATOR = 94; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTable Xml Table}' class. @@ -5618,7 +5638,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTable() * @generated */ - public static final int XML_TABLE = 95; + public static final int XML_TABLE = 97; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator Xml Table Generator}' class. @@ -5628,7 +5648,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTableGenerator() * @generated */ - public static final int XML_TABLE_GENERATOR = 96; + public static final int XML_TABLE_GENERATOR = 98; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTransient Xml Transient}' class. @@ -5638,7 +5658,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTransient() * @generated */ - public static final int XML_TRANSIENT = 97; + public static final int XML_TRANSIENT = 99; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint Xml Unique Constraint}' class. @@ -5648,7 +5668,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlUniqueConstraint() * @generated */ - public static final int XML_UNIQUE_CONSTRAINT = 99; + public static final int XML_UNIQUE_CONSTRAINT = 101; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlVersion Xml Version}' class. @@ -5658,7 +5678,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlVersion() * @generated */ - public static final int XML_VERSION = 100; + public static final int XML_VERSION = 102; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlOrderable Xml Orderable}' class. @@ -5668,7 +5688,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlOrderable() * @generated */ - public static final int XML_ORDERABLE = 73; + public static final int XML_ORDERABLE = 75; /** * The feature id for the 'Order Column' containment reference. @@ -6110,7 +6130,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumnContainer() * @generated */ - public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER = 87; + public static final int XML_PRIMARY_KEY_JOIN_COLUMN_CONTAINER = 89; /** * The feature id for the 'Primary Key Join Columns' containment reference list. @@ -6354,7 +6374,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlSqlResultSetMapping() * @generated */ - public static final int XML_SQL_RESULT_SET_MAPPING = 93; + public static final int XML_SQL_RESULT_SET_MAPPING = 95; /** * The feature id for the 'Description' attribute. @@ -6420,13 +6440,13 @@ public class OrmPackage extends EPackageImpl public static final int XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION; /** - * The feature id for the 'Parameter Mode' attribute. + * The feature id for the 'Mode' attribute. * * * @generated * @ordered */ - public static final int XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE; + public static final int XML_STORED_PROCEDURE_PARAMETER__MODE = OrmV2_1Package.XML_STORED_PROCEDURE_PARAMETER_21__MODE; /** * The feature id for the 'Name' attribute. @@ -6653,6 +6673,60 @@ public class OrmPackage extends EPackageImpl */ public static final int XML_TRANSIENT_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0; + /** + * The feature id for the 'Class Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TYPE_MAPPING__CLASS_NAME = XML_MANAGED_TYPE__CLASS_NAME; + + /** + * The feature id for the 'Description' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TYPE_MAPPING__DESCRIPTION = XML_MANAGED_TYPE__DESCRIPTION; + + /** + * The feature id for the 'Access' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TYPE_MAPPING__ACCESS = XML_MANAGED_TYPE_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Metadata Complete' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TYPE_MAPPING__METADATA_COMPLETE = XML_MANAGED_TYPE_FEATURE_COUNT + 1; + + /** + * The feature id for the 'Attributes' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_TYPE_MAPPING__ATTRIBUTES = XML_MANAGED_TYPE_FEATURE_COUNT + 2; + + /** + * The number of structural features of the 'Xml Type Mapping' class. + * + * + * @generated + * @ordered + */ + public static final int XML_TYPE_MAPPING_FEATURE_COUNT = XML_MANAGED_TYPE_FEATURE_COUNT + 3; + /** * The feature id for the 'Name' attribute. * @@ -6760,7 +6834,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getDiscriminatorType() * @generated */ - public static final int DISCRIMINATOR_TYPE = 101; + public static final int DISCRIMINATOR_TYPE = 103; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.EnumType Enum Type}' enum. @@ -6770,7 +6844,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getEnumType() * @generated */ - public static final int ENUM_TYPE = 102; + public static final int ENUM_TYPE = 104; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.FetchType Fetch Type}' enum. @@ -6780,7 +6854,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getFetchType() * @generated */ - public static final int FETCH_TYPE = 103; + public static final int FETCH_TYPE = 105; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.GenerationType Generation Type}' enum. @@ -6790,7 +6864,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getGenerationType() * @generated */ - public static final int GENERATION_TYPE = 104; + public static final int GENERATION_TYPE = 106; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.InheritanceType Inheritance Type}' enum. @@ -6800,7 +6874,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getInheritanceType() * @generated */ - public static final int INHERITANCE_TYPE = 105; + public static final int INHERITANCE_TYPE = 107; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.TemporalType Temporal Type}' enum. @@ -6810,7 +6884,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getTemporalType() * @generated */ - public static final int TEMPORAL_TYPE = 106; + public static final int TEMPORAL_TYPE = 108; /** * @@ -6875,6 +6949,13 @@ public class OrmPackage extends EPackageImpl */ private EClass xmlBaseJoinColumnEClass = null; + /** + * + * + * @generated + */ + private EClass abstractXmlManagedTypeEClass = null; + /** * * @@ -7218,6 +7299,13 @@ public class OrmPackage extends EPackageImpl */ private EClass lobEClass = null; + /** + * + * + * @generated + */ + private EClass xmlManagedTypeEClass = null; + /** * * @@ -7931,6 +8019,20 @@ public class OrmPackage extends EPackageImpl } + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType Abstract Xml Managed Type}'. + * + * + * @return the meta object for class 'Abstract Xml Managed Type'. + * @see org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType + * @generated + */ + public EClass getAbstractXmlManagedType() + { + return abstractXmlManagedTypeEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn Abstract Xml Named Column}'. * @@ -9827,6 +9929,50 @@ public class OrmPackage extends EPackageImpl return lobEClass; } + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType Xml Managed Type}'. + * + * + * @return the meta object for class 'Xml Managed Type'. + * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType + * @generated + */ + public EClass getXmlManagedType() + { + return xmlManagedTypeEClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName Class Name}'. + * + * + * @return the meta object for the attribute 'Class Name'. + * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName() + * @see #getXmlManagedType() + * @generated + */ + public EAttribute getXmlManagedType_ClassName() + { + return (EAttribute)xmlManagedTypeEClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription Description}'. + * + * + * @return the meta object for the attribute 'Description'. + * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription() + * @see #getXmlManagedType() + * @generated + */ + public EAttribute getXmlManagedType_Description() + { + return (EAttribute)xmlManagedTypeEClass.getEStructuralFeatures().get(1); + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany Xml Many To Many}'. * @@ -10869,20 +11015,6 @@ public class OrmPackage extends EPackageImpl return xmlTypeMappingEClass; } - /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName Class Name}'. - * - * - * @return the meta object for the attribute 'Class Name'. - * @see org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName() - * @see #getXmlTypeMapping() - * @generated - */ - public EAttribute getXmlTypeMapping_ClassName() - { - return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(0); - } - /** * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getMetadataComplete Metadata Complete}'. * @@ -10894,21 +11026,7 @@ public class OrmPackage extends EPackageImpl */ public EAttribute getXmlTypeMapping_MetadataComplete() { - return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(1); - } - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription Description}'. - * - * - * @return the meta object for the attribute 'Description'. - * @see org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription() - * @see #getXmlTypeMapping() - * @generated - */ - public EAttribute getXmlTypeMapping_Description() - { - return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(2); + return (EAttribute)xmlTypeMappingEClass.getEStructuralFeatures().get(0); } /** @@ -10922,7 +11040,7 @@ public class OrmPackage extends EPackageImpl */ public EReference getXmlTypeMapping_Attributes() { - return (EReference)xmlTypeMappingEClass.getEStructuralFeatures().get(3); + return (EReference)xmlTypeMappingEClass.getEStructuralFeatures().get(1); } /** @@ -11133,6 +11251,8 @@ public class OrmPackage extends EPackageImpl xmlBaseJoinColumnEClass = createEClass(XML_BASE_JOIN_COLUMN); createEAttribute(xmlBaseJoinColumnEClass, XML_BASE_JOIN_COLUMN__REFERENCED_COLUMN_NAME); + abstractXmlManagedTypeEClass = createEClass(ABSTRACT_XML_MANAGED_TYPE); + abstractXmlNamedColumnEClass = createEClass(ABSTRACT_XML_NAMED_COLUMN); abstractXmlRelationshipMappingEClass = createEClass(ABSTRACT_XML_RELATIONSHIP_MAPPING); @@ -11322,6 +11442,10 @@ public class OrmPackage extends EPackageImpl lobEClass = createEClass(LOB); + xmlManagedTypeEClass = createEClass(XML_MANAGED_TYPE); + createEAttribute(xmlManagedTypeEClass, XML_MANAGED_TYPE__CLASS_NAME); + createEAttribute(xmlManagedTypeEClass, XML_MANAGED_TYPE__DESCRIPTION); + xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY); xmlManyToOneEClass = createEClass(XML_MANY_TO_ONE); @@ -11438,9 +11562,7 @@ public class OrmPackage extends EPackageImpl xmlTransientEClass = createEClass(XML_TRANSIENT); xmlTypeMappingEClass = createEClass(XML_TYPE_MAPPING); - createEAttribute(xmlTypeMappingEClass, XML_TYPE_MAPPING__CLASS_NAME); createEAttribute(xmlTypeMappingEClass, XML_TYPE_MAPPING__METADATA_COMPLETE); - createEAttribute(xmlTypeMappingEClass, XML_TYPE_MAPPING__DESCRIPTION); createEReference(xmlTypeMappingEClass, XML_TYPE_MAPPING__ATTRIBUTES); xmlUniqueConstraintEClass = createEClass(XML_UNIQUE_CONSTRAINT); @@ -11511,6 +11633,7 @@ public class OrmPackage extends EPackageImpl abstractXmlMultiRelationshipMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlMultiRelationshipMapping_2_0()); xmlBaseDiscriminatorColumnEClass.getESuperTypes().add(this.getXmlNamedColumn()); xmlBaseJoinColumnEClass.getESuperTypes().add(this.getXmlNamedColumn()); + abstractXmlManagedTypeEClass.getESuperTypes().add(this.getXmlManagedType()); abstractXmlNamedColumnEClass.getESuperTypes().add(this.getXmlNamedColumn()); abstractXmlRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping()); abstractXmlSingleRelationshipMappingEClass.getESuperTypes().add(this.getAbstractXmlRelationshipMapping()); @@ -11519,6 +11642,7 @@ public class OrmPackage extends EPackageImpl abstractXmlSingleRelationshipMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlSingleRelationshipMapping_2_0()); abstractXmlReferenceTableEClass.getESuperTypes().add(this.getAbstractXmlTable()); abstractXmlReferenceTableEClass.getESuperTypes().add(this.getXmlReferenceTable()); + abstractXmlTypeMappingEClass.getESuperTypes().add(this.getAbstractXmlManagedType()); abstractXmlTypeMappingEClass.getESuperTypes().add(this.getXmlTypeMapping()); xmlAttributeMappingEClass.getESuperTypes().add(theOrmV2_0Package.getXmlAttributeMapping_2_0()); xmlAssociationOverrideEClass.getESuperTypes().add(this.getXmlOverride()); @@ -11539,6 +11663,7 @@ public class OrmPackage extends EPackageImpl columnResultEClass.getESuperTypes().add(theOrmV2_1Package.getColumnResult_2_1()); constructorResultEClass.getESuperTypes().add(theOrmV2_1Package.getConstructorResult_2_1()); xmlConvertEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConvert_2_1()); + xmlConverterEClass.getESuperTypes().add(this.getAbstractXmlManagedType()); xmlConverterEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConverter_2_1()); xmlConvertibleMappingEClass.getESuperTypes().add(theOrmV2_1Package.getXmlConvertibleMapping_2_1()); xmlDiscriminatorColumnEClass.getESuperTypes().add(this.getAbstractXmlBaseDiscriminatorColumn()); @@ -11590,7 +11715,6 @@ public class OrmPackage extends EPackageImpl xmlNamedNativeQueryEClass.getESuperTypes().add(this.getXmlQuery()); xmlNamedQueryEClass.getESuperTypes().add(this.getXmlQuery()); xmlNamedQueryEClass.getESuperTypes().add(theOrmV2_0Package.getXmlNamedQuery_2_0()); - xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(this.getXmlQuery()); xmlNamedStoredProcedureQueryEClass.getESuperTypes().add(theOrmV2_1Package.getXmlNamedStoredProcedureQuery_2_1()); xmlNullAttributeMappingEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping()); xmlOneToManyEClass.getESuperTypes().add(this.getAbstractXmlMultiRelationshipMapping()); @@ -11632,6 +11756,7 @@ public class OrmPackage extends EPackageImpl xmlTableGeneratorEClass.getESuperTypes().add(this.getXmlGenerator()); xmlTableGeneratorEClass.getESuperTypes().add(theOrmV2_1Package.getXmlTableGenerator_2_1()); xmlTransientEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping()); + xmlTypeMappingEClass.getESuperTypes().add(this.getXmlManagedType()); xmlTypeMappingEClass.getESuperTypes().add(this.getXmlAccessHolder()); xmlUniqueConstraintEClass.getESuperTypes().add(theOrmV2_0Package.getXmlUniqueConstraint_2_0()); xmlVersionEClass.getESuperTypes().add(this.getAbstractXmlAttributeMapping()); @@ -11668,6 +11793,8 @@ public class OrmPackage extends EPackageImpl initEClass(xmlBaseJoinColumnEClass, XmlBaseJoinColumn.class, "XmlBaseJoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlBaseJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, XmlBaseJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(abstractXmlManagedTypeEClass, AbstractXmlManagedType.class, "AbstractXmlManagedType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(abstractXmlNamedColumnEClass, AbstractXmlNamedColumn.class, "AbstractXmlNamedColumn", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(abstractXmlRelationshipMappingEClass, AbstractXmlRelationshipMapping.class, "AbstractXmlRelationshipMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -11857,6 +11984,10 @@ public class OrmPackage extends EPackageImpl initEClass(lobEClass, Lob.class, "Lob", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlManagedTypeEClass, XmlManagedType.class, "XmlManagedType", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlManagedType_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlManagedType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlManagedType_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlManagedType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlManyToManyEClass, XmlManyToMany.class, "XmlManyToMany", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlManyToOneEClass, XmlManyToOne.class, "XmlManyToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -11973,9 +12104,7 @@ public class OrmPackage extends EPackageImpl initEClass(xmlTransientEClass, XmlTransient.class, "XmlTransient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlTypeMappingEClass, XmlTypeMapping.class, "XmlTypeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlTypeMapping_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlTypeMapping_MetadataComplete(), theXMLTypePackage.getBooleanObject(), "metadataComplete", null, 0, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlTypeMapping_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlTypeMapping_Attributes(), this.getAttributes(), null, "attributes", null, 0, 1, XmlTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlUniqueConstraintEClass, XmlUniqueConstraint.class, "XmlUniqueConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -12209,6 +12338,16 @@ public class OrmPackage extends EPackageImpl */ public static final EAttribute XML_BASE_JOIN_COLUMN__REFERENCED_COLUMN_NAME = eINSTANCE.getXmlBaseJoinColumn_ReferencedColumnName(); + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType Abstract Xml Managed Type}' class. + * + * + * @see org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlManagedType + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getAbstractXmlManagedType() + * @generated + */ + public static final EClass ABSTRACT_XML_MANAGED_TYPE = eINSTANCE.getAbstractXmlManagedType(); + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlNamedColumn Abstract Xml Named Column}' class. * @@ -13411,6 +13550,32 @@ public class OrmPackage extends EPackageImpl */ public static final EClass LOB = eINSTANCE.getLob(); + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType Xml Managed Type}' class. + * + * + * @see org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType() + * @generated + */ + public static final EClass XML_MANAGED_TYPE = eINSTANCE.getXmlManagedType(); + + /** + * The meta object literal for the 'Class Name' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_MANAGED_TYPE__CLASS_NAME = eINSTANCE.getXmlManagedType_ClassName(); + + /** + * The meta object literal for the 'Description' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_MANAGED_TYPE__DESCRIPTION = eINSTANCE.getXmlManagedType_Description(); + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany Xml Many To Many}' class. * @@ -14099,14 +14264,6 @@ public class OrmPackage extends EPackageImpl */ public static final EClass XML_TYPE_MAPPING = eINSTANCE.getXmlTypeMapping(); - /** - * The meta object literal for the 'Class Name' attribute feature. - * - * - * @generated - */ - public static final EAttribute XML_TYPE_MAPPING__CLASS_NAME = eINSTANCE.getXmlTypeMapping_ClassName(); - /** * The meta object literal for the 'Metadata Complete' attribute feature. * @@ -14115,14 +14272,6 @@ public class OrmPackage extends EPackageImpl */ public static final EAttribute XML_TYPE_MAPPING__METADATA_COMPLETE = eINSTANCE.getXmlTypeMapping_MetadataComplete(); - /** - * The meta object literal for the 'Description' attribute feature. - * - * - * @generated - */ - public static final EAttribute XML_TYPE_MAPPING__DESCRIPTION = eINSTANCE.getXmlTypeMapping_Description(); - /** * The meta object literal for the 'Attributes' containment reference feature. * diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java index 60cff490d4..86d33c7f8a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlConverter.java @@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.v2_1.JPA2_1; import org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package; import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1; @@ -40,48 +39,8 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 +public class XmlConverter extends AbstractXmlManagedType implements XmlConverter_2_1 { - /** - * The default value of the '{@link #getDescription() Description}' attribute. - * - * - * @see #getDescription() - * @generated - * @ordered - */ - protected static final String DESCRIPTION_EDEFAULT = null; - - /** - * The cached value of the '{@link #getDescription() Description}' attribute. - * - * - * @see #getDescription() - * @generated - * @ordered - */ - protected String description = DESCRIPTION_EDEFAULT; - - /** - * The default value of the '{@link #getClassName() Class Name}' attribute. - * - * - * @see #getClassName() - * @generated - * @ordered - */ - protected static final String CLASS_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getClassName() Class Name}' attribute. - * - * - * @see #getClassName() - * @generated - * @ordered - */ - protected String className = CLASS_NAME_EDEFAULT; - /** * The default value of the '{@link #getAutoApply() Auto Apply}' attribute. * @@ -123,76 +82,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 return OrmPackage.Literals.XML_CONVERTER; } - /** - * Returns the value of the 'Description' attribute. - * - *- * If the meaning of the 'Description' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Description' attribute. - * @see #setDescription(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter_2_1_Description() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * @generated - */ - public String getDescription() - { - return description; - } - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter#getDescription Description}' attribute. - * - * - * @param value the new value of the 'Description' attribute. - * @see #getDescription() - * @generated - */ - public void setDescription(String newDescription) - { - String oldDescription = description; - description = newDescription; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERTER__DESCRIPTION, oldDescription, description)); - } - - /** - * Returns the value of the 'Class Name' attribute. - * - *- * If the meaning of the 'Class Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Class Name' attribute. - * @see #setClassName(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlConverter_2_1_ClassName() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" - * @generated - */ - public String getClassName() - { - return className; - } - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlConverter#getClassName Class Name}' attribute. - * - * - * @param value the new value of the 'Class Name' attribute. - * @see #getClassName() - * @generated - */ - public void setClassName(String newClassName) - { - String oldClassName = className; - className = newClassName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_CONVERTER__CLASS_NAME, oldClassName, className)); - } - /** * Returns the value of the 'Auto Apply' attribute. * @@ -238,10 +127,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 { switch (featureID) { - case OrmPackage.XML_CONVERTER__DESCRIPTION: - return getDescription(); - case OrmPackage.XML_CONVERTER__CLASS_NAME: - return getClassName(); case OrmPackage.XML_CONVERTER__AUTO_APPLY: return getAutoApply(); } @@ -258,12 +143,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 { switch (featureID) { - case OrmPackage.XML_CONVERTER__DESCRIPTION: - setDescription((String)newValue); - return; - case OrmPackage.XML_CONVERTER__CLASS_NAME: - setClassName((String)newValue); - return; case OrmPackage.XML_CONVERTER__AUTO_APPLY: setAutoApply((Boolean)newValue); return; @@ -281,12 +160,6 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 { switch (featureID) { - case OrmPackage.XML_CONVERTER__DESCRIPTION: - setDescription(DESCRIPTION_EDEFAULT); - return; - case OrmPackage.XML_CONVERTER__CLASS_NAME: - setClassName(CLASS_NAME_EDEFAULT); - return; case OrmPackage.XML_CONVERTER__AUTO_APPLY: setAutoApply(AUTO_APPLY_EDEFAULT); return; @@ -304,16 +177,50 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 { switch (featureID) { - case OrmPackage.XML_CONVERTER__DESCRIPTION: - return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case OrmPackage.XML_CONVERTER__CLASS_NAME: - return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className); case OrmPackage.XML_CONVERTER__AUTO_APPLY: return AUTO_APPLY_EDEFAULT == null ? autoApply != null : !AUTO_APPLY_EDEFAULT.equals(autoApply); } return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) + { + if (baseClass == XmlConverter_2_1.class) + { + switch (derivedFeatureID) + { + case OrmPackage.XML_CONVERTER__AUTO_APPLY: return OrmV2_1Package.XML_CONVERTER_21__AUTO_APPLY; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) + { + if (baseClass == XmlConverter_2_1.class) + { + switch (baseFeatureID) + { + case OrmV2_1Package.XML_CONVERTER_21__AUTO_APPLY: return OrmPackage.XML_CONVERTER__AUTO_APPLY; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + /** * * @@ -325,11 +232,7 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (description: "); - result.append(description); - result.append(", className: "); - result.append(className); - result.append(", autoApply: "); + result.append(" (autoApply: "); result.append(autoApply); result.append(')'); return result.toString(); @@ -358,13 +261,5 @@ public class XmlConverter extends EBaseObjectImpl implements XmlConverter_2_1 protected static Translator buildAutoApplyTranslator() { return new BooleanTranslator(JPA2_1.AUTO_APPLY, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_AutoApply(), Translator.DOM_ATTRIBUTE); } - - protected static Translator buildDescriptionTranslator() { - return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_Description()); - } - - protected static Translator buildClassTranslator() { - return new Translator(JPA.CLASS, OrmV2_1Package.eINSTANCE.getXmlConverter_2_1_ClassName(), Translator.DOM_ATTRIBUTE); - } } // XmlConverter diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManagedType.java new file mode 100644 index 0000000000..11858b238f --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlManagedType.java @@ -0,0 +1,109 @@ +/******************************************************************************* + * Copyright (c) 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.core.resource.orm; + +import org.eclipse.jdt.core.IType; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.text.edits.ReplaceEdit; + +/** + * + * A representation of the model object 'Xml Managed Type'. + * + * 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. + * + * + *+ * The following features are supported: + *
+ * If the meaning of the 'Class Name' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Class Name' attribute. + * @see #setClassName(String) + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_ClassName() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * @generated + */ + String getClassName(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getClassName Class Name}' attribute. + * + * + * @param value the new value of the 'Class Name' attribute. + * @see #getClassName() + * @generated + */ + void setClassName(String value); + + /** + * Returns the value of the 'Description' attribute. + * + *+ * If the meaning of the 'Description' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Description' attribute. + * @see #setDescription(String) + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlManagedType_Description() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getDescription(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType#getDescription Description}' attribute. + * + * + * @param value the new value of the 'Description' attribute. + * @see #getDescription() + * @generated + */ + void setDescription(String value); + + + TextRange getClassTextRange(); + + // ********** refactoring ********** + + ReplaceEdit createRenameTypeEdit(IType originalType, String newName); + + ReplaceEdit createRenamePackageEdit(String newName); + + + // ********** content assist ********* + + boolean classNameTouches(int pos); + +} // XmlManagedType diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java index aee536752f..13978551c0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlNamedStoredProcedureQuery.java @@ -53,7 +53,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlQuery, XmlNamedStoredProcedureQuery_2_1 +public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements XmlNamedStoredProcedureQuery_2_1 { /** * The default value of the '{@link #getDescription() Description}' attribute. @@ -522,50 +522,6 @@ public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements Xml return super.eIsSet(featureID); } - /** - * - * - * @generated - */ - @Override - public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) - { - if (baseClass == XmlNamedStoredProcedureQuery_2_1.class) - { - switch (derivedFeatureID) - { - case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES; - case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS; - case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME; - case OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS: return OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS; - default: return -1; - } - } - return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); - } - - /** - * - * - * @generated - */ - @Override - public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) - { - if (baseClass == XmlNamedStoredProcedureQuery_2_1.class) - { - switch (baseFeatureID) - { - case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASSES; - case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPINGS; - case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME; - case OrmV2_1Package.XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS: return OrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS; - default: return -1; - } - } - return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); - } - /** * * diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java index 198842f06e..be716cf004 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlStoredProcedureParameter.java @@ -64,24 +64,24 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS protected String description = DESCRIPTION_EDEFAULT; /** - * The default value of the '{@link #getParameterMode() Parameter Mode}' attribute. + * The default value of the '{@link #getMode() Mode}' attribute. * * - * @see #getParameterMode() + * @see #getMode() * @generated * @ordered */ - protected static final ParameterMode_2_1 PARAMETER_MODE_EDEFAULT = ParameterMode_2_1.IN; + protected static final ParameterMode_2_1 MODE_EDEFAULT = ParameterMode_2_1.IN; /** - * The cached value of the '{@link #getParameterMode() Parameter Mode}' attribute. + * The cached value of the '{@link #getMode() Mode}' attribute. * * - * @see #getParameterMode() + * @see #getMode() * @generated * @ordered */ - protected ParameterMode_2_1 parameterMode = PARAMETER_MODE_EDEFAULT; + protected ParameterMode_2_1 mode = MODE_EDEFAULT; /** * The default value of the '{@link #getName() Name}' attribute. @@ -180,41 +180,41 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS } /** - * Returns the value of the 'Parameter Mode' attribute. + * Returns the value of the 'Mode' attribute. * The literals are from the enumeration {@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1}. * *- * If the meaning of the 'Parameter Mode' attribute isn't clear, + * If the meaning of the 'Mode' attribute isn't clear, * there really should be more of a description here... *
* - * @return the value of the 'Parameter Mode' attribute. + * @return the value of the 'Mode' attribute. * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1 - * @see #setParameterMode(ParameterMode_2_1) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_ParameterMode() + * @see #setMode(ParameterMode_2_1) + * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlStoredProcedureParameter_2_1_Mode() * @model * @generated */ - public ParameterMode_2_1 getParameterMode() + public ParameterMode_2_1 getMode() { - return parameterMode; + return mode; } /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getParameterMode Parameter Mode}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlStoredProcedureParameter#getMode Mode}' attribute. * * - * @param value the new value of the 'Parameter Mode' attribute. + * @param value the new value of the 'Mode' attribute. * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1 - * @see #getParameterMode() + * @see #getMode() * @generated */ - public void setParameterMode(ParameterMode_2_1 newParameterMode) + public void setMode(ParameterMode_2_1 newMode) { - ParameterMode_2_1 oldParameterMode = parameterMode; - parameterMode = newParameterMode == null ? PARAMETER_MODE_EDEFAULT : newParameterMode; + ParameterMode_2_1 oldMode = mode; + mode = newMode == null ? MODE_EDEFAULT : newMode; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE, oldParameterMode, parameterMode)); + eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE, oldMode, mode)); } /** @@ -299,8 +299,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS { case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION: return getDescription(); - case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE: - return getParameterMode(); + case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE: + return getMode(); case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: return getName(); case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME: @@ -322,8 +322,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION: setDescription((String)newValue); return; - case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE: - setParameterMode((ParameterMode_2_1)newValue); + case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE: + setMode((ParameterMode_2_1)newValue); return; case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: setName((String)newValue); @@ -348,8 +348,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION: setDescription(DESCRIPTION_EDEFAULT); return; - case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE: - setParameterMode(PARAMETER_MODE_EDEFAULT); + case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE: + setMode(MODE_EDEFAULT); return; case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: setName(NAME_EDEFAULT); @@ -373,8 +373,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS { case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__DESCRIPTION: return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); - case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__PARAMETER_MODE: - return parameterMode != PARAMETER_MODE_EDEFAULT; + case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__MODE: + return mode != MODE_EDEFAULT; case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case OrmPackage.XML_STORED_PROCEDURE_PARAMETER__CLASS_NAME: @@ -396,8 +396,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS StringBuffer result = new StringBuffer(super.toString()); result.append(" (description: "); result.append(description); - result.append(", parameterMode: "); - result.append(parameterMode); + result.append(", mode: "); + result.append(mode); result.append(", name: "); result.append(name); result.append(", className: "); @@ -422,8 +422,8 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS return new Translator[] { buildNameTranslator(), buildClassTranslator(), + buildModeTranslator(), buildDescriptionTranslator(), - buildParameterModeTranslator(), }; } @@ -439,7 +439,7 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements XmlS return new Translator(JPA.DESCRIPTION, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_Description()); } - protected static Translator buildParameterModeTranslator() { - return new Translator(JPA2_1.PARAMETER_MODE, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_ParameterMode()); + protected static Translator buildModeTranslator() { + return new Translator(JPA2_1.MODE, OrmV2_1Package.eINSTANCE.getXmlStoredProcedureParameter_2_1_Mode(), Translator.DOM_ATTRIBUTE); } } // XmlStoredProcedureParameter diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java index 79c3414c8d..528b1bd4e2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/XmlTypeMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. + * Copyright (c) 2009, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,9 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.resource.orm; -import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.text.edits.ReplaceEdit; /** * @@ -28,9 +26,7 @@ import org.eclipse.text.edits.ReplaceEdit; ** The following features are supported: *
- * If the meaning of the 'Class Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Class Name' attribute. - * @see #setClassName(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_ClassName() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" - * @generated - */ - String getClassName(); - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getClassName Class Name}' attribute. - * - * - * @param value the new value of the 'Class Name' attribute. - * @see #getClassName() - * @generated - */ - void setClassName(String value); - /** * Returns the value of the 'Metadata Complete' attribute. * @@ -93,32 +63,6 @@ public interface XmlTypeMapping extends XmlAccessHolder */ void setMetadataComplete(Boolean value); - /** - * Returns the value of the 'Description' attribute. - * - *- * If the meaning of the 'Description' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Description' attribute. - * @see #setDescription(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.OrmPackage#getXmlTypeMapping_Description() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * @generated - */ - String getDescription(); - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping#getDescription Description}' attribute. - * - * - * @param value the new value of the 'Description' attribute. - * @see #getDescription() - * @generated - */ - void setDescription(String value); - /** * Returns the value of the 'Attributes' containment reference. * @@ -144,8 +88,6 @@ public interface XmlTypeMapping extends XmlAccessHolder * @generated */ void setAttributes(Attributes value); - - TextRange getClassTextRange(); TextRange getAttributesTextRange(); @@ -154,14 +96,4 @@ public interface XmlTypeMapping extends XmlAccessHolder //TODO not happy with this, or the corresponding one in XmlAttributeMapping String getMappingKey(); - - // ********** refactoring ********** - - ReplaceEdit createRenameTypeEdit(IType originalType, String newName); - - ReplaceEdit createRenamePackageEdit(String newName); - - // ********** content assist ********* - - boolean classNameTouches(int pos); } // XmlTypeMapping diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java index 63bae07b62..aee2d764a0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/OrmV2_1Package.java @@ -281,22 +281,22 @@ public class OrmV2_1Package extends EPackageImpl public static final int XML_CONVERTER_21 = 5; /** - * The feature id for the 'Description' attribute. + * The feature id for the 'Class Name' attribute. * * * @generated * @ordered */ - public static final int XML_CONVERTER_21__DESCRIPTION = 0; + public static final int XML_CONVERTER_21__CLASS_NAME = OrmPackage.XML_MANAGED_TYPE__CLASS_NAME; /** - * The feature id for the 'Class Name' attribute. + * The feature id for the 'Description' attribute. * * * @generated * @ordered */ - public static final int XML_CONVERTER_21__CLASS_NAME = 1; + public static final int XML_CONVERTER_21__DESCRIPTION = OrmPackage.XML_MANAGED_TYPE__DESCRIPTION; /** * The feature id for the 'Auto Apply' attribute. @@ -305,7 +305,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_CONVERTER_21__AUTO_APPLY = 2; + public static final int XML_CONVERTER_21__AUTO_APPLY = OrmPackage.XML_MANAGED_TYPE_FEATURE_COUNT + 0; /** * The number of structural features of the 'Xml Converter 21' class. @@ -314,7 +314,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_CONVERTER_21_FEATURE_COUNT = 3; + public static final int XML_CONVERTER_21_FEATURE_COUNT = OrmPackage.XML_MANAGED_TYPE_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverterContainer_2_1 Xml Converter Container 21}' class. @@ -987,6 +987,33 @@ public class OrmV2_1Package extends EPackageImpl */ public static final int XML_NAMED_ENTITY_GRAPH_21_FEATURE_COUNT = 5; + /** + * The feature id for the 'Description' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__DESCRIPTION = OrmPackage.XML_QUERY__DESCRIPTION; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__NAME = OrmPackage.XML_QUERY__NAME; + + /** + * The feature id for the 'Hints' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__HINTS = OrmPackage.XML_QUERY__HINTS; + /** * The feature id for the 'Result Classes' attribute list. * @@ -994,7 +1021,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES = 0; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_CLASSES = OrmPackage.XML_QUERY_FEATURE_COUNT + 0; /** * The feature id for the 'Result Set Mappings' attribute list. @@ -1003,7 +1030,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS = 1; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__RESULT_SET_MAPPINGS = OrmPackage.XML_QUERY_FEATURE_COUNT + 1; /** * The feature id for the 'Procedure Name' attribute. @@ -1012,7 +1039,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME = 2; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PROCEDURE_NAME = OrmPackage.XML_QUERY_FEATURE_COUNT + 2; /** * The feature id for the 'Parameters' containment reference list. @@ -1021,7 +1048,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS = 3; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21__PARAMETERS = OrmPackage.XML_QUERY_FEATURE_COUNT + 3; /** * The number of structural features of the 'Xml Named Stored Procedure Query 21' class. @@ -1030,7 +1057,7 @@ public class OrmV2_1Package extends EPackageImpl * @generated * @ordered */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT = 4; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_21_FEATURE_COUNT = OrmPackage.XML_QUERY_FEATURE_COUNT + 4; /** * The feature id for the 'Named Attribute Nodes' containment reference list. @@ -1177,13 +1204,13 @@ public class OrmV2_1Package extends EPackageImpl public static final int XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION = 0; /** - * The feature id for the 'Parameter Mode' attribute. + * The feature id for the 'Mode' attribute. * * * @generated * @ordered */ - public static final int XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE = 1; + public static final int XML_STORED_PROCEDURE_PARAMETER_21__MODE = 1; /** * The feature id for the 'Name' attribute. @@ -1802,34 +1829,6 @@ public class OrmV2_1Package extends EPackageImpl return xmlConverter_2_1EClass; } - /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription Description}'. - * - * - * @return the meta object for the attribute 'Description'. - * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription() - * @see #getXmlConverter_2_1() - * @generated - */ - public EAttribute getXmlConverter_2_1_Description() - { - return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(0); - } - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName Class Name}'. - * - * - * @return the meta object for the attribute 'Class Name'. - * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName() - * @see #getXmlConverter_2_1() - * @generated - */ - public EAttribute getXmlConverter_2_1_ClassName() - { - return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(1); - } - /** * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getAutoApply Auto Apply}'. * @@ -1841,7 +1840,7 @@ public class OrmV2_1Package extends EPackageImpl */ public EAttribute getXmlConverter_2_1_AutoApply() { - return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(2); + return (EAttribute)xmlConverter_2_1EClass.getEStructuralFeatures().get(0); } /** @@ -2640,15 +2639,15 @@ public class OrmV2_1Package extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode Parameter Mode}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode Mode}'. * * - * @return the meta object for the attribute 'Parameter Mode'. - * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode() + * @return the meta object for the attribute 'Mode'. + * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode() * @see #getXmlStoredProcedureParameter_2_1() * @generated */ - public EAttribute getXmlStoredProcedureParameter_2_1_ParameterMode() + public EAttribute getXmlStoredProcedureParameter_2_1_Mode() { return (EAttribute)xmlStoredProcedureParameter_2_1EClass.getEStructuralFeatures().get(1); } @@ -3043,8 +3042,6 @@ public class OrmV2_1Package extends EPackageImpl createEAttribute(xmlConvert_2_1EClass, XML_CONVERT_21__DISABLE_CONVERSION); xmlConverter_2_1EClass = createEClass(XML_CONVERTER_21); - createEAttribute(xmlConverter_2_1EClass, XML_CONVERTER_21__DESCRIPTION); - createEAttribute(xmlConverter_2_1EClass, XML_CONVERTER_21__CLASS_NAME); createEAttribute(xmlConverter_2_1EClass, XML_CONVERTER_21__AUTO_APPLY); xmlConverterContainer_2_1EClass = createEClass(XML_CONVERTER_CONTAINER_21); @@ -3134,7 +3131,7 @@ public class OrmV2_1Package extends EPackageImpl xmlStoredProcedureParameter_2_1EClass = createEClass(XML_STORED_PROCEDURE_PARAMETER_21); createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION); - createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE); + createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__MODE); createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__NAME); createEAttribute(xmlStoredProcedureParameter_2_1EClass, XML_STORED_PROCEDURE_PARAMETER_21__CLASS_NAME); @@ -3177,15 +3174,18 @@ public class OrmV2_1Package extends EPackageImpl // Obtain other dependent packages XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI); // Create type parameters // Set bounds for type parameters // Add supertypes to classes + xmlConverter_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlManagedType()); xmlEntity_2_1EClass.getESuperTypes().add(this.getXmlQueryContainer_2_1()); xmlEntityMappings_2_1EClass.getESuperTypes().add(this.getXmlConverterContainer_2_1()); xmlEntityMappings_2_1EClass.getESuperTypes().add(this.getXmlQueryContainer_2_1()); + xmlNamedStoredProcedureQuery_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlQuery()); // Initialize classes and features; add operations and parameters initEClass(columnResult_2_1EClass, ColumnResult_2_1.class, "ColumnResult_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -3209,8 +3209,6 @@ public class OrmV2_1Package extends EPackageImpl initEAttribute(getXmlConvert_2_1_DisableConversion(), theXMLTypePackage.getBooleanObject(), "disableConversion", null, 0, 1, XmlConvert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlConverter_2_1EClass, XmlConverter_2_1.class, "XmlConverter_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlConverter_2_1_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlConverter_2_1_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlConverter_2_1_AutoApply(), theXMLTypePackage.getBooleanObject(), "autoApply", null, 0, 1, XmlConverter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlConverterContainer_2_1EClass, XmlConverterContainer_2_1.class, "XmlConverterContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -3300,7 +3298,7 @@ public class OrmV2_1Package extends EPackageImpl initEClass(xmlStoredProcedureParameter_2_1EClass, XmlStoredProcedureParameter_2_1.class, "XmlStoredProcedureParameter_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlStoredProcedureParameter_2_1_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getXmlStoredProcedureParameter_2_1_ParameterMode(), this.getParameterMode_2_1(), "parameterMode", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlStoredProcedureParameter_2_1_Mode(), this.getParameterMode_2_1(), "mode", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlStoredProcedureParameter_2_1_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlStoredProcedureParameter_2_1_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlStoredProcedureParameter_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3475,22 +3473,6 @@ public class OrmV2_1Package extends EPackageImpl */ public static final EClass XML_CONVERTER_21 = eINSTANCE.getXmlConverter_2_1(); - /** - * The meta object literal for the 'Description' attribute feature. - * - * - * @generated - */ - public static final EAttribute XML_CONVERTER_21__DESCRIPTION = eINSTANCE.getXmlConverter_2_1_Description(); - - /** - * The meta object literal for the 'Class Name' attribute feature. - * - * - * @generated - */ - public static final EAttribute XML_CONVERTER_21__CLASS_NAME = eINSTANCE.getXmlConverter_2_1_ClassName(); - /** * The meta object literal for the 'Auto Apply' attribute feature. * @@ -3962,12 +3944,12 @@ public class OrmV2_1Package extends EPackageImpl public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_21__DESCRIPTION = eINSTANCE.getXmlStoredProcedureParameter_2_1_Description(); /** - * The meta object literal for the 'Parameter Mode' attribute feature. + * The meta object literal for the 'Mode' attribute feature. * * * @generated */ - public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_21__PARAMETER_MODE = eINSTANCE.getXmlStoredProcedureParameter_2_1_ParameterMode(); + public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_21__MODE = eINSTANCE.getXmlStoredProcedureParameter_2_1_Mode(); /** * The meta object literal for the 'Name' attribute feature. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java index 7a819a04c0..442c2f12b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlConverter_2_1.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Oracle. All rights reserved. + * Copyright (c) 2012, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.resource.orm.v2_1; +import org.eclipse.jpt.jpa.core.resource.orm.XmlManagedType; import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** @@ -25,71 +26,16 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject; ** The following features are supported: *
- * If the meaning of the 'Description' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Description' attribute. - * @see #setDescription(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConverter_2_1_Description() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" - * @generated - */ - String getDescription(); - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getDescription Description}' attribute. - * - * - * @param value the new value of the 'Description' attribute. - * @see #getDescription() - * @generated - */ - void setDescription(String value); - - /** - * Returns the value of the 'Class Name' attribute. - * - *- * If the meaning of the 'Class Name' attribute isn't clear, - * there really should be more of a description here... - *
- * - * @return the value of the 'Class Name' attribute. - * @see #setClassName(String) - * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlConverter_2_1_ClassName() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" - * @generated - */ - String getClassName(); - - /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConverter_2_1#getClassName Class Name}' attribute. - * - * - * @param value the new value of the 'Class Name' attribute. - * @see #getClassName() - * @generated - */ - void setClassName(String value); - /** * Returns the value of the 'Auto Apply' attribute. * diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java index d814ffcb54..bb406283a3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlNamedStoredProcedureQuery_2_1.java @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.resource.orm.v2_1; import org.eclipse.emf.common.util.EList; +import org.eclipse.jpt.jpa.core.resource.orm.XmlQuery; import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** @@ -35,10 +36,9 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject; * * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlNamedStoredProcedureQuery_2_1() * @model kind="class" interface="true" abstract="true" - * @extends EBaseObject * @generated */ -public interface XmlNamedStoredProcedureQuery_2_1 extends EBaseObject +public interface XmlNamedStoredProcedureQuery_2_1 extends XmlQuery { /** * Returns the value of the 'Result Classes' attribute list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java index 6e0025f1b4..5c01c22d9c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/model/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/XmlStoredProcedureParameter_2_1.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.common.core.resource.xml.EBaseObject; * The following features are supported: *- * If the meaning of the 'Parameter Mode' attribute isn't clear, + * If the meaning of the 'Mode' attribute isn't clear, * there really should be more of a description here... *
* - * @return the value of the 'Parameter Mode' attribute. + * @return the value of the 'Mode' attribute. * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1 - * @see #setParameterMode(ParameterMode_2_1) - * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlStoredProcedureParameter_2_1_ParameterMode() + * @see #setMode(ParameterMode_2_1) + * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.OrmV2_1Package#getXmlStoredProcedureParameter_2_1_Mode() * @model * @generated */ - ParameterMode_2_1 getParameterMode(); + ParameterMode_2_1 getMode(); /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getParameterMode Parameter Mode}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlStoredProcedureParameter_2_1#getMode Mode}' attribute. * * - * @param value the new value of the 'Parameter Mode' attribute. + * @param value the new value of the 'Mode' attribute. * @see org.eclipse.jpt.jpa.core.resource.orm.v2_1.ParameterMode_2_1 - * @see #getParameterMode() + * @see #getMode() * @generated */ - void setParameterMode(ParameterMode_2_1 value); + void setMode(ParameterMode_2_1 value); /** * Returns the value of the 'Name' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java index 71fda2fda1..002b311670 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/v2_1/JPA2_1.java @@ -55,7 +55,7 @@ public interface JPA2_1 String NAMED_ENTITY_GRAPH = "named-entity-graph"; String NAMED_STORED_PROCEDURE_QUERY = "named-stored-procedure-query"; String PARAMETER = "parameter"; - String PARAMETER_MODE = "parameter-mode"; + String MODE = "mode"; String PROCEDURE_NAME = "procedure-name"; String PRIMARY_KEY_FOREIGN_KEY = "primary-key-foreign-key"; String RESULT_CLASS = "result-class"; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel index 3af30c5619..70ee4ea94b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel @@ -180,8 +180,6 @@- * If the meaning of the 'Direction' attribute isn't clear, + * If the meaning of the 'Optional' attribute isn't clear, * there really should be more of a description here... *
* - * @return the value of the 'Direction' attribute. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection - * @see #setDirection(XmlDirection) - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Direction() - * @model + * @return the value of the 'Optional' attribute. + * @see #setOptional(Boolean) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_2_3_Optional() + * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ - public XmlDirection getDirection() + public Boolean getOptional() { - return direction; + return optional; } /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection Direction}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getOptional Optional}' attribute. * * - * @param value the new value of the 'Direction' attribute. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection - * @see #getDirection() + * @param value the new value of the 'Optional' attribute. + * @see #getOptional() * @generated */ - public void setDirection(XmlDirection newDirection) + public void setOptional(Boolean newOptional) { - XmlDirection oldDirection = direction; - direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection; + Boolean oldOptional = optional; + optional = newOptional; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION, oldDirection, direction)); + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL, oldOptional, optional)); } /** - * Returns the value of the 'Name' attribute. + * Returns the value of the 'Direction' attribute. + * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection}. * *- * If the meaning of the 'Name' attribute isn't clear, + * If the meaning of the 'Direction' attribute isn't clear, * there really should be more of a description here... *
* - * @return the value of the 'Name' attribute. - * @see #setName(String) - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Name() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @return the value of the 'Direction' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection + * @see #setDirection(XmlDirection) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Direction() + * @model * @generated */ - public String getName() + public XmlDirection getDirection() { - return name; + return direction; } /** - * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getName Name}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection Direction}' attribute. * * - * @param value the new value of the 'Name' attribute. - * @see #getName() + * @param value the new value of the 'Direction' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection + * @see #getDirection() * @generated */ - public void setName(String newName) + public void setDirection(XmlDirection newDirection) { - String oldName = name; - name = newName; + XmlDirection oldDirection = direction; + direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME, oldName, name)); + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION, oldDirection, direction)); } /** @@ -413,10 +412,10 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas { switch (featureID) { + case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL: + return getOptional(); case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION: return getDirection(); - case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: - return getName(); case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER: return getQueryParameter(); case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE: @@ -439,12 +438,12 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas { switch (featureID) { + case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL: + setOptional((Boolean)newValue); + return; case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION: setDirection((XmlDirection)newValue); return; - case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: - setName((String)newValue); - return; case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER: setQueryParameter((String)newValue); return; @@ -471,12 +470,12 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas { switch (featureID) { + case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL: + setOptional(OPTIONAL_EDEFAULT); + return; case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION: setDirection(DIRECTION_EDEFAULT); return; - case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: - setName(NAME_EDEFAULT); - return; case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER: setQueryParameter(QUERY_PARAMETER_EDEFAULT); return; @@ -503,10 +502,10 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas { switch (featureID) { + case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL: + return OPTIONAL_EDEFAULT == null ? optional != null : !OPTIONAL_EDEFAULT.equals(optional); case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION: return direction != DIRECTION_EDEFAULT; - case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER: return QUERY_PARAMETER_EDEFAULT == null ? queryParameter != null : !QUERY_PARAMETER_EDEFAULT.equals(queryParameter); case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE: @@ -519,6 +518,44 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) + { + if (baseClass == XmlStoredProcedureParameter_2_3.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL: return EclipseLinkOrmV2_3Package.XML_STORED_PROCEDURE_PARAMETER_23__OPTIONAL; + default: return -1; + } + } + return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); + } + + /** + * + * + * @generated + */ + @Override + public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) + { + if (baseClass == XmlStoredProcedureParameter_2_3.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_3Package.XML_STORED_PROCEDURE_PARAMETER_23__OPTIONAL: return EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__OPTIONAL; + default: return -1; + } + } + return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); + } + /** * * @@ -530,10 +567,10 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (direction: "); + result.append(" (optional: "); + result.append(optional); + result.append(", direction: "); result.append(direction); - result.append(", name: "); - result.append(name); result.append(", queryParameter: "); result.append(queryParameter); result.append(", type: "); @@ -560,11 +597,15 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas private static Translator[] buildTranslatorChildren() { return new Translator[] { buildDirectionTranslator(), + buildModeTranslator(), buildNameTranslator(), buildQueryParameterTranslator(), + buildOptionalTranslator(), buildTypeTranslator(), buildJdbcTypeTranslator(), buildJdbcTypeNameTranslator(), + buildClassTranslator(), + buildDescriptionTranslator(), }; } @@ -572,14 +613,14 @@ public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBas return new Translator(EclipseLink.PARAMETER__DIRECTION, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_Direction(), Translator.DOM_ATTRIBUTE); } - protected static Translator buildNameTranslator() { - return new Translator(EclipseLink.PARAMETER__NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_Name(), Translator.DOM_ATTRIBUTE); - } - protected static Translator buildQueryParameterTranslator() { return new Translator(EclipseLink.PARAMETER__QUERY_PARAMETER, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_QueryParameter(), Translator.DOM_ATTRIBUTE); } + protected static Translator buildOptionalTranslator() { + return new Translator(EclipseLink2_3.OPTIONAL, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlStoredProcedureParameter_2_3_Optional(), Translator.DOM_ATTRIBUTE); + } + protected static Translator buildTypeTranslator() { return new Translator(EclipseLink.PARAMETER__TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_Type(), Translator.DOM_ATTRIBUTE); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java index d9d26f679a..ed5675eed0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; +import org.eclipse.jpt.jpa.core.resource.orm.JPA; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -207,6 +207,6 @@ public class XmlStruct extends EBaseObjectImpl implements XmlStruct_2_3 } protected static Translator buildNameTranslator() { - return new Translator(EclipseLink2_3.STRUCT__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlStruct_2_3_Name(), Translator.DOM_ATTRIBUTE); + return new Translator(JPA.NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlStruct_2_3_Name(), Translator.DOM_ATTRIBUTE); } } // XmlStruct diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java index ad8359f436..ae0c796ee6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java @@ -162,7 +162,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3() * @generated */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23 = 11; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23 = 12; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3 Xml Plsql Record 23}' class. @@ -172,7 +172,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlRecord_2_3() * @generated */ - public static final int XML_PLSQL_RECORD_23 = 12; + public static final int XML_PLSQL_RECORD_23 = 13; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3 Xml Plsql Table 23}' class. @@ -182,7 +182,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlTable_2_3() * @generated */ - public static final int XML_PLSQL_TABLE_23 = 13; + public static final int XML_PLSQL_TABLE_23 = 14; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3 Xml Struct 23}' class. @@ -192,7 +192,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStruct_2_3() * @generated */ - public static final int XML_STRUCT_23 = 14; + public static final int XML_STRUCT_23 = 16; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 Xml Attributes 23}' class. @@ -212,7 +212,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStructure_2_3() * @generated */ - public static final int XML_STRUCTURE_23 = 16; + public static final int XML_STRUCTURE_23 = 18; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3 Xml Array 23}' class. @@ -367,7 +367,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3() * @generated */ - public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23 = 15; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23 = 17; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3 Xml Element Collection 23}' class. @@ -712,6 +712,43 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ public static final int XML_NAMED_STORED_FUNCTION_QUERY_23_FEATURE_COUNT = 1; + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3 Xml Named Stored Procedure Query 23}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredProcedureQuery_2_3() + * @generated + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_23 = 11; + + /** + * The feature id for the 'Multiple Result Sets' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_23__MULTIPLE_RESULT_SETS = 0; + + /** + * The feature id for the 'Call By Index' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_23__CALL_BY_INDEX = 1; + + /** + * The number of structural features of the 'Xml Named Stored Procedure Query 23' class. + * + * + * @generated + * @ordered + */ + public static final int XML_NAMED_STORED_PROCEDURE_QUERY_23_FEATURE_COUNT = 2; + /** * The feature id for the 'Tenant Discriminator Columns' containment reference list. * @@ -766,6 +803,34 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ public static final int XML_PLSQL_TABLE_23_FEATURE_COUNT = 1; + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3 Xml Stored Procedure Parameter 23}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStoredProcedureParameter_2_3() + * @generated + */ + public static final int XML_STORED_PROCEDURE_PARAMETER_23 = 15; + + /** + * The feature id for the 'Optional' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_STORED_PROCEDURE_PARAMETER_23__OPTIONAL = 0; + + /** + * The number of structural features of the 'Xml Stored Procedure Parameter 23' class. + * + * + * @generated + * @ordered + */ + public static final int XML_STORED_PROCEDURE_PARAMETER_23_FEATURE_COUNT = 1; + /** * The feature id for the 'Name' attribute. * @@ -873,7 +938,7 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getMultitenantType() * @generated */ - public static final int MULTITENANT_TYPE = 17; + public static final int MULTITENANT_TYPE = 19; /** * @@ -910,6 +975,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ private EClass xmlNamedStoredFunctionQuery_2_3EClass = null; + /** + * + * + * @generated + */ + private EClass xmlNamedStoredProcedureQuery_2_3EClass = null; + /** * * @@ -952,6 +1024,13 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ private EClass xmlPlsqlTable_2_3EClass = null; + /** + * + * + * @generated + */ + private EClass xmlStoredProcedureParameter_2_3EClass = null; + /** * * @@ -1281,6 +1360,50 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl } + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3 Xml Named Stored Procedure Query 23}'. + * + * + * @return the meta object for class 'Xml Named Stored Procedure Query 23'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3 + * @generated + */ + public EClass getXmlNamedStoredProcedureQuery_2_3() + { + return xmlNamedStoredProcedureQuery_2_3EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3#getMultipleResultSets Multiple Result Sets}'. + * + * + * @return the meta object for the attribute 'Multiple Result Sets'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3#getMultipleResultSets() + * @see #getXmlNamedStoredProcedureQuery_2_3() + * @generated + */ + public EAttribute getXmlNamedStoredProcedureQuery_2_3_MultipleResultSets() + { + return (EAttribute)xmlNamedStoredProcedureQuery_2_3EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3#getCallByIndex Call By Index}'. + * + * + * @return the meta object for the attribute 'Call By Index'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3#getCallByIndex() + * @see #getXmlNamedStoredProcedureQuery_2_3() + * @generated + */ + public EAttribute getXmlNamedStoredProcedureQuery_2_3_CallByIndex() + { + return (EAttribute)xmlNamedStoredProcedureQuery_2_3EClass.getEStructuralFeatures().get(1); + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3 Xml Entity 23}'. * @@ -1663,6 +1786,35 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl } + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3 Xml Stored Procedure Parameter 23}'. + * + * + * @return the meta object for class 'Xml Stored Procedure Parameter 23'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3 + * @generated + */ + public EClass getXmlStoredProcedureParameter_2_3() + { + return xmlStoredProcedureParameter_2_3EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3#getOptional Optional}'. + * + * + * @return the meta object for the attribute 'Optional'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3#getOptional() + * @see #getXmlStoredProcedureParameter_2_3() + * @generated + */ + public EAttribute getXmlStoredProcedureParameter_2_3_Optional() + { + return (EAttribute)xmlStoredProcedureParameter_2_3EClass.getEStructuralFeatures().get(0); + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3 Xml Struct 23}'. * @@ -1980,6 +2132,10 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl xmlNamedStoredFunctionQuery_2_3EClass = createEClass(XML_NAMED_STORED_FUNCTION_QUERY_23); createEAttribute(xmlNamedStoredFunctionQuery_2_3EClass, XML_NAMED_STORED_FUNCTION_QUERY_23__NAME); + xmlNamedStoredProcedureQuery_2_3EClass = createEClass(XML_NAMED_STORED_PROCEDURE_QUERY_23); + createEAttribute(xmlNamedStoredProcedureQuery_2_3EClass, XML_NAMED_STORED_PROCEDURE_QUERY_23__MULTIPLE_RESULT_SETS); + createEAttribute(xmlNamedStoredProcedureQuery_2_3EClass, XML_NAMED_STORED_PROCEDURE_QUERY_23__CALL_BY_INDEX); + xmlPersistenceUnitDefaults_2_3EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_23); createEReference(xmlPersistenceUnitDefaults_2_3EClass, XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS); @@ -1989,6 +2145,9 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl xmlPlsqlTable_2_3EClass = createEClass(XML_PLSQL_TABLE_23); createEAttribute(xmlPlsqlTable_2_3EClass, XML_PLSQL_TABLE_23__NAME); + xmlStoredProcedureParameter_2_3EClass = createEClass(XML_STORED_PROCEDURE_PARAMETER_23); + createEAttribute(xmlStoredProcedureParameter_2_3EClass, XML_STORED_PROCEDURE_PARAMETER_23__OPTIONAL); + xmlStruct_2_3EClass = createEClass(XML_STRUCT_23); createEAttribute(xmlStruct_2_3EClass, XML_STRUCT_23__NAME); @@ -2097,6 +2256,10 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl initEClass(xmlNamedStoredFunctionQuery_2_3EClass, XmlNamedStoredFunctionQuery_2_3.class, "XmlNamedStoredFunctionQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlNamedStoredFunctionQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedStoredFunctionQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlNamedStoredProcedureQuery_2_3EClass, XmlNamedStoredProcedureQuery_2_3.class, "XmlNamedStoredProcedureQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlNamedStoredProcedureQuery_2_3_MultipleResultSets(), theXMLTypePackage.getBooleanObject(), "multipleResultSets", null, 0, 1, XmlNamedStoredProcedureQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlNamedStoredProcedureQuery_2_3_CallByIndex(), theXMLTypePackage.getBooleanObject(), "callByIndex", null, 0, 1, XmlNamedStoredProcedureQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlPersistenceUnitDefaults_2_3EClass, XmlPersistenceUnitDefaults_2_3.class, "XmlPersistenceUnitDefaults_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2106,6 +2269,9 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl initEClass(xmlPlsqlTable_2_3EClass, XmlPlsqlTable_2_3.class, "XmlPlsqlTable_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlPlsqlTable_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPlsqlTable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlStoredProcedureParameter_2_3EClass, XmlStoredProcedureParameter_2_3.class, "XmlStoredProcedureParameter_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlStoredProcedureParameter_2_3_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, XmlStoredProcedureParameter_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlStruct_2_3EClass, XmlStruct_2_3.class, "XmlStruct_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlStruct_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStruct_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2251,6 +2417,32 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ public static final EAttribute XML_NAMED_STORED_FUNCTION_QUERY_23__NAME = eINSTANCE.getXmlNamedStoredFunctionQuery_2_3_Name(); + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3 Xml Named Stored Procedure Query 23}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredProcedureQuery_2_3() + * @generated + */ + public static final EClass XML_NAMED_STORED_PROCEDURE_QUERY_23 = eINSTANCE.getXmlNamedStoredProcedureQuery_2_3(); + + /** + * The meta object literal for the 'Multiple Result Sets' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY_23__MULTIPLE_RESULT_SETS = eINSTANCE.getXmlNamedStoredProcedureQuery_2_3_MultipleResultSets(); + + /** + * The meta object literal for the 'Call By Index' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY_23__CALL_BY_INDEX = eINSTANCE.getXmlNamedStoredProcedureQuery_2_3_CallByIndex(); + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3 Xml Entity 23}' class. * @@ -2471,6 +2663,24 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl */ public static final EAttribute XML_PLSQL_TABLE_23__NAME = eINSTANCE.getXmlPlsqlTable_2_3_Name(); + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3 Xml Stored Procedure Parameter 23}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStoredProcedureParameter_2_3() + * @generated + */ + public static final EClass XML_STORED_PROCEDURE_PARAMETER_23 = eINSTANCE.getXmlStoredProcedureParameter_2_3(); + + /** + * The meta object literal for the 'Optional' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_STORED_PROCEDURE_PARAMETER_23__OPTIONAL = eINSTANCE.getXmlStoredProcedureParameter_2_3_Optional(); + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3 Xml Struct 23}' class. * diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredProcedureQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredProcedureQuery_2_3.java new file mode 100644 index 0000000000..80a96d73ad --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredProcedureQuery_2_3.java @@ -0,0 +1,86 @@ +/******************************************************************************* + * Copyright (c) 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; + +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; + +/** + * + * A representation of the model object 'Xml Named Stored Procedure Query 23'. + * + * + *+ * The following features are supported: + *
+ * If the meaning of the 'Multiple Result Sets' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Multiple Result Sets' attribute. + * @see #setMultipleResultSets(Boolean) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredProcedureQuery_2_3_MultipleResultSets() + * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" + * @generated + */ + Boolean getMultipleResultSets(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3#getMultipleResultSets Multiple Result Sets}' attribute. + * + * + * @param value the new value of the 'Multiple Result Sets' attribute. + * @see #getMultipleResultSets() + * @generated + */ + void setMultipleResultSets(Boolean value); + + /** + * Returns the value of the 'Call By Index' attribute. + * + *+ * If the meaning of the 'Call By Index' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Call By Index' attribute. + * @see #setCallByIndex(Boolean) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredProcedureQuery_2_3_CallByIndex() + * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" + * @generated + */ + Boolean getCallByIndex(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredProcedureQuery_2_3#getCallByIndex Call By Index}' attribute. + * + * + * @param value the new value of the 'Call By Index' attribute. + * @see #getCallByIndex() + * @generated + */ + void setCallByIndex(Boolean value); + +} // XmlNamedStoredProcedureQuery_2_3 diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStoredProcedureParameter_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStoredProcedureParameter_2_3.java new file mode 100644 index 0000000000..be448bd63a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStoredProcedureParameter_2_3.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; + +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; + +/** + * + * A representation of the model object 'Xml Stored Procedure Parameter 23'. + * + * + *+ * The following features are supported: + *
+ * If the meaning of the 'Optional' attribute isn't clear, + * there really should be more of a description here... + *
+ * + * @return the value of the 'Optional' attribute. + * @see #setOptional(Boolean) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStoredProcedureParameter_2_3_Optional() + * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" + * @generated + */ + Boolean getOptional(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStoredProcedureParameter_2_3#getOptional Optional}' attribute. + * + * + * @param value the new value of the 'Optional' attribute. + * @see #getOptional() + * @generated + */ + void setOptional(Boolean value); + +} // XmlStoredProcedureParameter_2_3 diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java index eaee4a0baf..31f8bd39c2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Oracle. All rights reserved. This + * Copyright (c) 2008, 2013 Oracle. All rights reserved. This * program and the accompanying materials are made available under the terms of * the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -85,7 +85,6 @@ public interface EclipseLink String NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET = "returns-result-set"; //$NON-NLS-1$ String NAMED_STORED_PROCEDURE_QUERY__PARAMETER = "parameter"; //$NON-NLS-1$ String PARAMETER__DIRECTION = "direction"; //$NON-NLS-1$ - String PARAMETER__NAME = "name"; //$NON-NLS-1$ String PARAMETER__QUERY_PARAMETER = "query-parameter"; //$NON-NLS-1$ String PARAMETER__TYPE = "type"; //$NON-NLS-1$ String PARAMETER__JDBC_TYPE = "jdbc-type"; //$NON-NLS-1$ diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java index 544889224a..48563fa93e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -34,17 +34,11 @@ public interface EclipseLink2_3 String MULTITENANT_TYPE = "multiltenant-type"; String NAMED_STORED_FUNCTION_QUERY = "named-stored-function-query"; - String NAMED_STORED_FUNCTION_QUERY__NAME = "nname"; String NAMED_PLSQL_STORED_PROCEDURE_QUERY = "named-plsql-stored-procedure-query"; - String NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME = "name"; String NAMED_PLSQL_STORED_FUNCTION_QUERY = "named-plsql-stored-function-query"; - String NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME = "name"; String PLSQL_RECORD = "plsql-record"; - String PLSQL_RECORD__NAME = "name"; String PLSQL_TABLE = "plsql-table"; - String PLSQL_TABLE__NAME = "name"; String STRUCT = "struct"; - String STRUCT__NAME = "name"; String STRUCTURE = "structure"; String STRUCTURE__ATTRIBUTE_TYPE = "attribute-type"; @@ -53,5 +47,8 @@ public interface EclipseLink2_3 String TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY= "primary-key"; String TENANT_DISCRIMINATOR_COLUMN__TABLE = "table"; + String CALL_BY_INDEX = "call-by-index"; //$NON-NLS-1$ + String MULTIPLE_RESULT_SETS = "multiple-result-sets"; //$NON-NLS-1$ + String OPTIONAL = "optional"; //$NON-NLS-1$ } \ No newline at end of file -- cgit v1.2.3