diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.core/src/org/eclipse')
23 files changed, 169 insertions, 869 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index e4f93d3069..ba8ce73fc5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -35,8 +35,8 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmPersistentAttribute2_0; import org.eclipse.jpt.core.resource.orm.AbstractXmlMultiRelationshipMapping; import org.eclipse.jpt.core.resource.orm.MapKey; import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlColumn; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.db.Table; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; @@ -448,7 +448,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<T extends AbstractXmlM String old = this.specifiedMapKeyClass; this.specifiedMapKeyClass = mapKeyClass; if (this.attributeValueHasChanged(old, mapKeyClass)) { - XmlMapKeyClass xmlMapKeyClass = this.getXmlMapKeyClass(); + XmlClassReference xmlMapKeyClass = this.getXmlMapKeyClass(); if (mapKeyClass == null) { if (xmlMapKeyClass != null) { this.removeXmlMapKeyClass(); @@ -469,12 +469,12 @@ public abstract class AbstractOrmMultiRelationshipMapping<T extends AbstractXmlM this.firePropertyChanged(SPECIFIED_MAP_KEY_CLASS_PROPERTY, old, mapKeyClass); } - protected XmlMapKeyClass getXmlMapKeyClass() { + protected XmlClassReference getXmlMapKeyClass() { return this.resourceAttributeMapping.getMapKeyClass(); } - protected XmlMapKeyClass addXmlMapKeyClass() { - XmlMapKeyClass mapKeyClass = OrmFactory.eINSTANCE.createXmlMapKeyClass(); + protected XmlClassReference addXmlMapKeyClass() { + XmlClassReference mapKeyClass = OrmFactory.eINSTANCE.createXmlClassReference(); this.resourceAttributeMapping.setMapKeyClass(mapKeyClass); return mapKeyClass; } @@ -494,7 +494,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<T extends AbstractXmlM } protected String getResourceMapKeyClass() { - XmlMapKeyClass mapKeyClass = this.resourceAttributeMapping.getMapKeyClass(); + XmlClassReference mapKeyClass = this.resourceAttributeMapping.getMapKeyClass(); return mapKeyClass == null ? null : mapKeyClass.getClassName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdClassReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdClassReference.java index c0813b8f6f..7bff13363b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdClassReference.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdClassReference.java @@ -20,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.core.resource.orm.OrmFactory; -import org.eclipse.jpt.core.resource.orm.XmlIdClass; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlIdClassContainer; import org.eclipse.jpt.core.resource.orm.XmlTypeMapping; import org.eclipse.jpt.core.utility.TextRange; @@ -98,7 +98,7 @@ public class GenericOrmIdClassReference } protected String buildSpecifiedIdClassName() { - XmlIdClass element = getIdClassElement(); + XmlClassReference element = getIdClassElement(); if (element != null) { return element.getClassName(); } @@ -155,12 +155,12 @@ public class GenericOrmIdClassReference return (XmlIdClassContainer) getResourceTypeMapping(); } - protected XmlIdClass getIdClassElement() { + protected XmlClassReference getIdClassElement() { return getResourceIdClassContainer().getIdClass(); } protected void addIdClassElement() { - getResourceIdClassContainer().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass()); + getResourceIdClassContainer().setIdClass(OrmFactory.eINSTANCE.createXmlClassReference()); } protected void removeIdClassElement() { @@ -168,7 +168,7 @@ public class GenericOrmIdClassReference } protected JavaResourcePersistentType getResourceIdClass() { - XmlIdClass element = getIdClassElement(); + XmlClassReference element = getIdClassElement(); String className = (element == null) ? null : element.getClassName(); if (className == null) { @@ -219,7 +219,7 @@ public class GenericOrmIdClassReference // **************** validation ******************************************** public TextRange getValidationTextRange() { - XmlIdClass element = getIdClassElement(); + XmlClassReference element = getIdClassElement(); return (element == null) ? getTypeMapping().getValidationTextRange() : element.getClassNameTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java index 3a661f8680..6671dc45ee 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java @@ -58,10 +58,10 @@ import org.eclipse.jpt.core.resource.orm.MapKey; import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride; import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlCollectionTable; import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.core.resource.orm.XmlElementCollection; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.db.Table; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -901,7 +901,7 @@ public class GenericOrmElementCollectionMapping2_0 String old = this.specifiedMapKeyClass; this.specifiedMapKeyClass = mapKeyClass; if (this.attributeValueHasChanged(old, mapKeyClass)) { - XmlMapKeyClass xmlMapKeyClass = this.getXmlMapKeyClass(); + XmlClassReference xmlMapKeyClass = this.getXmlMapKeyClass(); if (mapKeyClass == null) { if (xmlMapKeyClass != null) { this.removeXmlMapKeyClass(); @@ -922,12 +922,12 @@ public class GenericOrmElementCollectionMapping2_0 this.firePropertyChanged(SPECIFIED_MAP_KEY_CLASS_PROPERTY, old, mapKeyClass); } - protected XmlMapKeyClass getXmlMapKeyClass() { + protected XmlClassReference getXmlMapKeyClass() { return this.resourceAttributeMapping.getMapKeyClass(); } - protected XmlMapKeyClass addXmlMapKeyClass() { - XmlMapKeyClass mapKeyClass = OrmFactory.eINSTANCE.createXmlMapKeyClass(); + protected XmlClassReference addXmlMapKeyClass() { + XmlClassReference mapKeyClass = OrmFactory.eINSTANCE.createXmlClassReference(); this.resourceAttributeMapping.setMapKeyClass(mapKeyClass); return mapKeyClass; } @@ -947,7 +947,7 @@ public class GenericOrmElementCollectionMapping2_0 } protected String getResourceMapKeyClass() { - XmlMapKeyClass mapKeyClass = this.resourceAttributeMapping.getMapKeyClass(); + XmlClassReference mapKeyClass = this.resourceAttributeMapping.getMapKeyClass(); return mapKeyClass == null ? null : mapKeyClass.getClassName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualMapKeyClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualMapKeyClassReference.java index 7b2102fcb2..448d5c5158 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualMapKeyClass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualMapKeyClassReference.java @@ -10,13 +10,13 @@ package org.eclipse.jpt.core.internal.jpa2.context.orm; import org.eclipse.jpt.core.jpa2.context.CollectionMapping2_0; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; -public class VirtualMapKeyClass extends XmlMapKeyClass +public class VirtualMapKeyClassReference extends XmlClassReference { CollectionMapping2_0 javaCollectionMapping; - public VirtualMapKeyClass(CollectionMapping2_0 collectionMapping) { + public VirtualMapKeyClassReference(CollectionMapping2_0 collectionMapping) { super(); this.javaCollectionMapping = collectionMapping; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlElementCollection2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlElementCollection2_0.java index 80aeee6011..48ab15b350 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlElementCollection2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlElementCollection2_0.java @@ -28,10 +28,10 @@ import org.eclipse.jpt.core.resource.orm.MapKey; import org.eclipse.jpt.core.resource.orm.OrmPackage; import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride; import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlCollectionTable; import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.core.resource.orm.XmlElementCollection; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; import org.eclipse.jpt.core.resource.orm.XmlOrderColumn; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -50,7 +50,7 @@ public class VirtualXmlElementCollection2_0 extends XmlElementCollection protected final MapKey mapKey; - protected final XmlMapKeyClass mapKeyClass; + protected final XmlClassReference mapKeyClass; protected final VirtualXmlOrderColumn orderColumn; @@ -67,7 +67,7 @@ public class VirtualXmlElementCollection2_0 extends XmlElementCollection this.javaAttributeMapping = javaMapping; this.virtualXmlAttributeMapping = new VirtualXmlAttributeMapping(ormTypeMapping, javaMapping); this.mapKey = new VirtualMapKey(javaMapping); - this.mapKeyClass = new VirtualMapKeyClass(javaMapping); + this.mapKeyClass = new VirtualMapKeyClassReference(javaMapping); this.orderColumn = new VirtualXmlOrderColumn( ((Orderable2_0) this.javaAttributeMapping.getOrderable()).getOrderColumn(), this.ormTypeMapping); @@ -228,7 +228,7 @@ public class VirtualXmlElementCollection2_0 extends XmlElementCollection } @Override - public XmlMapKeyClass getMapKeyClass() { + public XmlClassReference getMapKeyClass() { if (this.isOrmMetadataComplete()) { return null; } @@ -236,7 +236,7 @@ public class VirtualXmlElementCollection2_0 extends XmlElementCollection } @Override - public void setMapKeyClass(XmlMapKeyClass newMapKeyClass) { + public void setMapKeyClass(XmlClassReference newMapKeyClass) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$ } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlManyToMany2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlManyToMany2_0.java index 8499da4d74..84139ae535 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlManyToMany2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlManyToMany2_0.java @@ -20,10 +20,10 @@ import org.eclipse.jpt.core.resource.orm.AccessType; import org.eclipse.jpt.core.resource.orm.CascadeType; import org.eclipse.jpt.core.resource.orm.FetchType; import org.eclipse.jpt.core.resource.orm.MapKey; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.core.resource.orm.XmlJoinTable; import org.eclipse.jpt.core.resource.orm.XmlManyToMany; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; import org.eclipse.jpt.core.resource.orm.XmlOrderColumn; import org.eclipse.jpt.core.utility.TextRange; @@ -40,7 +40,7 @@ public class VirtualXmlManyToMany2_0 extends XmlManyToMany protected final VirtualXmlManyToMany virtualXmlManyToMany; - protected final XmlMapKeyClass mapKeyClass; + protected final XmlClassReference mapKeyClass; protected VirtualXmlOrderColumn orderColumn; @@ -51,7 +51,7 @@ public class VirtualXmlManyToMany2_0 extends XmlManyToMany this.ormTypeMapping = ormTypeMapping; this.javaAttributeMapping = javaManyToManyMapping; this.virtualXmlManyToMany = new VirtualXmlManyToMany(ormTypeMapping, javaManyToManyMapping); - this.mapKeyClass = new VirtualMapKeyClass(javaManyToManyMapping); + this.mapKeyClass = new VirtualMapKeyClassReference(javaManyToManyMapping); this.orderColumn = new VirtualXmlOrderColumn( ((Orderable2_0) this.javaAttributeMapping.getOrderable()).getOrderColumn(), this.ormTypeMapping); @@ -144,7 +144,7 @@ public class VirtualXmlManyToMany2_0 extends XmlManyToMany } @Override - public XmlMapKeyClass getMapKeyClass() { + public XmlClassReference getMapKeyClass() { if (this.isOrmMetadataComplete()) { return null; } @@ -152,7 +152,7 @@ public class VirtualXmlManyToMany2_0 extends XmlManyToMany } @Override - public void setMapKeyClass(XmlMapKeyClass newMapKeyClass) { + public void setMapKeyClass(XmlClassReference newMapKeyClass) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$ } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlOneToMany2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlOneToMany2_0.java index ca2a94e6ba..49595a86e6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlOneToMany2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/VirtualXmlOneToMany2_0.java @@ -27,10 +27,10 @@ import org.eclipse.jpt.core.resource.orm.CascadeType; import org.eclipse.jpt.core.resource.orm.FetchType; import org.eclipse.jpt.core.resource.orm.MapKey; import org.eclipse.jpt.core.resource.orm.OrmPackage; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.core.resource.orm.XmlJoinTable; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; import org.eclipse.jpt.core.resource.orm.XmlOneToMany; import org.eclipse.jpt.core.resource.orm.XmlOrderColumn; import org.eclipse.jpt.core.utility.TextRange; @@ -49,7 +49,7 @@ public class VirtualXmlOneToMany2_0 extends XmlOneToMany protected final VirtualXmlOneToMany virtualXmlOneToMany; - protected final XmlMapKeyClass mapKeyClass; + protected final XmlClassReference mapKeyClass; protected VirtualXmlOrderColumn orderColumn; @@ -61,7 +61,7 @@ public class VirtualXmlOneToMany2_0 extends XmlOneToMany this.ormTypeMapping = ormTypeMapping; this.javaAttributeMapping = javaOneToManyMapping; this.virtualXmlOneToMany = new VirtualXmlOneToMany(ormTypeMapping, javaOneToManyMapping); - this.mapKeyClass = new VirtualMapKeyClass(javaOneToManyMapping); + this.mapKeyClass = new VirtualMapKeyClassReference(javaOneToManyMapping); this.orderColumn = new VirtualXmlOrderColumn( ((Orderable2_0) this.javaAttributeMapping.getOrderable()).getOrderColumn(), this.ormTypeMapping); @@ -172,7 +172,7 @@ public class VirtualXmlOneToMany2_0 extends XmlOneToMany } @Override - public XmlMapKeyClass getMapKeyClass() { + public XmlClassReference getMapKeyClass() { if (this.isOrmMetadataComplete()) { return null; } @@ -180,7 +180,7 @@ public class VirtualXmlOneToMany2_0 extends XmlOneToMany } @Override - public void setMapKeyClass(XmlMapKeyClass newMapKeyClass) { + public void setMapKeyClass(XmlClassReference newMapKeyClass) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$ } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java index 48be5bd41c..9969e30be8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/AbstractXmlResourceProvider.java @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java index 3a9711562a..d4e118eb13 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlMultiRelationshipMapping.java @@ -121,7 +121,7 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel * @generated * @ordered */ - protected XmlMapKeyClass mapKeyClass; + protected XmlClassReference mapKeyClass; /** * changed this to null and removed the generated flag so emf won't generate over it * we don't want a default for enums, just null if the tag does not exist @@ -419,12 +419,12 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Class</em>' containment reference. - * @see #setMapKeyClass(XmlMapKeyClass) + * @see #setMapKeyClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMultiRelationshipMapping_2_0_MapKeyClass() * @model containment="true" * @generated */ - public XmlMapKeyClass getMapKeyClass() + public XmlClassReference getMapKeyClass() { return mapKeyClass; } @@ -434,9 +434,9 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetMapKeyClass(XmlMapKeyClass newMapKeyClass, NotificationChain msgs) + public NotificationChain basicSetMapKeyClass(XmlClassReference newMapKeyClass, NotificationChain msgs) { - XmlMapKeyClass oldMapKeyClass = mapKeyClass; + XmlClassReference oldMapKeyClass = mapKeyClass; mapKeyClass = newMapKeyClass; if (eNotificationRequired()) { @@ -454,7 +454,7 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel * @see #getMapKeyClass() * @generated */ - public void setMapKeyClass(XmlMapKeyClass newMapKeyClass) + public void setMapKeyClass(XmlClassReference newMapKeyClass) { if (newMapKeyClass != mapKeyClass) { @@ -779,7 +779,7 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel getMapKeyAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue); return; case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS: - setMapKeyClass((XmlMapKeyClass)newValue); + setMapKeyClass((XmlClassReference)newValue); return; case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL: setMapKeyTemporal((TemporalType)newValue); @@ -827,7 +827,7 @@ public abstract class AbstractXmlMultiRelationshipMapping extends AbstractXmlRel getMapKeyAttributeOverrides().clear(); return; case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_CLASS: - setMapKeyClass((XmlMapKeyClass)null); + setMapKeyClass((XmlClassReference)null); return; case OrmPackage.ABSTRACT_XML_MULTI_RELATIONSHIP_MAPPING__MAP_KEY_TEMPORAL: setMapKeyTemporal(MAP_KEY_TEMPORAL_EDEFAULT); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java index cc0cd745c8..9275e86824 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java @@ -102,7 +102,6 @@ public class OrmFactory extends EFactoryImpl case OrmPackage.FIELD_RESULT: return (EObject)createFieldResult(); case OrmPackage.XML_GENERATED_VALUE: return (EObject)createXmlGeneratedValue(); case OrmPackage.XML_ID: return (EObject)createXmlId(); - case OrmPackage.XML_ID_CLASS: return (EObject)createXmlIdClass(); case OrmPackage.INHERITANCE: return (EObject)createInheritance(); case OrmPackage.XML_JOIN_COLUMN: return (EObject)createXmlJoinColumn(); case OrmPackage.XML_JOIN_TABLE: return (EObject)createXmlJoinTable(); @@ -110,7 +109,6 @@ public class OrmFactory extends EFactoryImpl case OrmPackage.XML_MANY_TO_MANY: return (EObject)createXmlManyToMany(); case OrmPackage.XML_MANY_TO_ONE: return (EObject)createXmlManyToOne(); case OrmPackage.MAP_KEY: return (EObject)createMapKey(); - case OrmPackage.XML_MAP_KEY_CLASS: return (EObject)createXmlMapKeyClass(); case OrmPackage.XML_MAPPED_SUPERCLASS: return (EObject)createXmlMappedSuperclass(); case OrmPackage.XML_NAMED_NATIVE_QUERY: return (EObject)createXmlNamedNativeQuery(); case OrmPackage.XML_NAMED_QUERY: return (EObject)createXmlNamedQuery(); @@ -446,17 +444,6 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public XmlIdClass createXmlIdClass() - { - XmlIdClass xmlIdClass = new XmlIdClass(); - return xmlIdClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public Inheritance createInheritance() { Inheritance inheritance = new Inheritance(); @@ -534,17 +521,6 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public XmlMapKeyClass createXmlMapKeyClass() - { - XmlMapKeyClass xmlMapKeyClass = new XmlMapKeyClass(); - return xmlMapKeyClass; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public XmlMappedSuperclass createXmlMappedSuperclass() { XmlMappedSuperclass xmlMappedSuperclass = new XmlMappedSuperclass(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java index 93cba863ba..d1e929fc12 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java @@ -739,7 +739,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTypeMapping() * @generated */ - public static final int XML_TYPE_MAPPING = 83; + public static final int XML_TYPE_MAPPING = 81; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractXmlTypeMapping <em>Abstract Xml Type Mapping</em>}' class. @@ -759,7 +759,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumnsMapping() * @generated */ - public static final int XML_JOIN_COLUMNS_MAPPING = 46; + public static final int XML_JOIN_COLUMNS_MAPPING = 45; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class. @@ -2710,16 +2710,6 @@ public class OrmPackage extends EPackageImpl public static final int XML_ID = 41; /** - * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass <em>Xml Id Class</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.XmlIdClass - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass() - * @generated - */ - public static final int XML_ID_CLASS = 42; - - /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2727,7 +2717,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance() * @generated */ - public static final int INHERITANCE = 44; + public static final int INHERITANCE = 43; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Xml Join Column</em>}' class. @@ -2737,7 +2727,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinColumn() * @generated */ - public static final int XML_JOIN_COLUMN = 45; + public static final int XML_JOIN_COLUMN = 44; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class. @@ -2747,7 +2737,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTable() * @generated */ - public static final int XML_JOIN_TABLE = 47; + public static final int XML_JOIN_TABLE = 46; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping <em>Xml Join Table Mapping</em>}' class. @@ -2757,7 +2747,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlJoinTableMapping() * @generated */ - public static final int XML_JOIN_TABLE_MAPPING = 48; + public static final int XML_JOIN_TABLE_MAPPING = 47; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}' class. @@ -2767,7 +2757,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getLob() * @generated */ - public static final int LOB = 49; + public static final int LOB = 48; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class. @@ -2777,7 +2767,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToMany() * @generated */ - public static final int XML_MANY_TO_MANY = 50; + public static final int XML_MANY_TO_MANY = 49; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class. @@ -2787,7 +2777,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlManyToOne() * @generated */ - public static final int XML_MANY_TO_ONE = 51; + public static final int XML_MANY_TO_ONE = 50; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}' class. @@ -2797,17 +2787,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey() * @generated */ - public static final int MAP_KEY = 52; - - /** - * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.XmlMapKeyClass - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyClass() - * @generated - */ - public static final int XML_MAP_KEY_CLASS = 53; + public static final int MAP_KEY = 51; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedByMapping <em>Xml Mapped By Mapping</em>}' class. @@ -2817,7 +2797,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedByMapping() * @generated */ - public static final int XML_MAPPED_BY_MAPPING = 54; + public static final int XML_MAPPED_BY_MAPPING = 52; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class. @@ -2827,7 +2807,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMappedSuperclass() * @generated */ - public static final int XML_MAPPED_SUPERCLASS = 55; + public static final int XML_MAPPED_SUPERCLASS = 53; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Xml Query</em>}' class. @@ -2837,7 +2817,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQuery() * @generated */ - public static final int XML_QUERY = 74; + public static final int XML_QUERY = 72; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class. @@ -2847,7 +2827,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedNativeQuery() * @generated */ - public static final int XML_NAMED_NATIVE_QUERY = 56; + public static final int XML_NAMED_NATIVE_QUERY = 54; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class. @@ -2857,7 +2837,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNamedQuery() * @generated */ - public static final int XML_NAMED_QUERY = 57; + public static final int XML_NAMED_QUERY = 55; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping <em>Xml Null Attribute Mapping</em>}' class. @@ -2867,7 +2847,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlNullAttributeMapping() * @generated */ - public static final int XML_NULL_ATTRIBUTE_MAPPING = 58; + public static final int XML_NULL_ATTRIBUTE_MAPPING = 56; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class. @@ -2877,7 +2857,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToMany() * @generated */ - public static final int XML_ONE_TO_MANY = 59; + public static final int XML_ONE_TO_MANY = 57; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class. @@ -2887,7 +2867,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOneToOne() * @generated */ - public static final int XML_ONE_TO_ONE = 60; + public static final int XML_ONE_TO_ONE = 58; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class. @@ -2897,7 +2877,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderColumn() * @generated */ - public static final int XML_ORDER_COLUMN = 62; + public static final int XML_ORDER_COLUMN = 60; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class. @@ -2907,7 +2887,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitDefaults() * @generated */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 63; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 61; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class. @@ -2917,7 +2897,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPersistenceUnitMetadata() * @generated */ - public static final int XML_PERSISTENCE_UNIT_METADATA = 64; + public static final int XML_PERSISTENCE_UNIT_METADATA = 62; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}' class. @@ -2927,7 +2907,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad() * @generated */ - public static final int POST_LOAD = 66; + public static final int POST_LOAD = 64; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}' class. @@ -2937,7 +2917,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist() * @generated */ - public static final int POST_PERSIST = 67; + public static final int POST_PERSIST = 65; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}' class. @@ -2947,7 +2927,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove() * @generated */ - public static final int POST_REMOVE = 68; + public static final int POST_REMOVE = 66; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}' class. @@ -2957,7 +2937,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate() * @generated */ - public static final int POST_UPDATE = 69; + public static final int POST_UPDATE = 67; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}' class. @@ -2967,7 +2947,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist() * @generated */ - public static final int PRE_PERSIST = 70; + public static final int PRE_PERSIST = 68; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}' class. @@ -2977,7 +2957,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove() * @generated */ - public static final int PRE_REMOVE = 71; + public static final int PRE_REMOVE = 69; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}' class. @@ -2987,7 +2967,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate() * @generated */ - public static final int PRE_UPDATE = 72; + public static final int PRE_UPDATE = 70; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Xml Primary Key Join Column</em>}' class. @@ -2997,7 +2977,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlPrimaryKeyJoinColumn() * @generated */ - public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 73; + public static final int XML_PRIMARY_KEY_JOIN_COLUMN = 71; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}' class. @@ -3007,7 +2987,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryContainer() * @generated */ - public static final int XML_QUERY_CONTAINER = 75; + public static final int XML_QUERY_CONTAINER = 73; /** * The feature id for the '<em><b>Version</b></em>' attribute. @@ -3442,24 +3422,6 @@ public class OrmPackage extends EPackageImpl public static final int XML_ID_FEATURE_COUNT = ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Class Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int XML_ID_CLASS__CLASS_NAME = 0; - - /** - * The number of structural features of the '<em>Xml Id Class</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int XML_ID_CLASS_FEATURE_COUNT = 1; - - /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClassContainer <em>Xml Id Class Container</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3467,7 +3429,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClassContainer() * @generated */ - public static final int XML_ID_CLASS_CONTAINER = 43; + public static final int XML_ID_CLASS_CONTAINER = 42; /** * The feature id for the '<em><b>Id Class</b></em>' containment reference. @@ -3594,7 +3556,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlReferenceTable() * @generated */ - public static final int XML_REFERENCE_TABLE = 65; + public static final int XML_REFERENCE_TABLE = 63; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -3957,24 +3919,6 @@ public class OrmPackage extends EPackageImpl public static final int MAP_KEY_FEATURE_COUNT = 1; /** - * The feature id for the '<em><b>Class Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int XML_MAP_KEY_CLASS__CLASS_NAME = OrmV2_0Package.XML_MAP_KEY_CLASS_20__CLASS_NAME; - - /** - * The number of structural features of the '<em>Xml Map Key Class</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int XML_MAP_KEY_CLASS_FEATURE_COUNT = OrmV2_0Package.XML_MAP_KEY_CLASS_20_FEATURE_COUNT + 0; - - /** * The feature id for the '<em><b>Mapped By</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4576,7 +4520,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlQueryHint() * @generated */ - public static final int XML_QUERY_HINT = 76; + public static final int XML_QUERY_HINT = 74; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class. @@ -4586,7 +4530,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSecondaryTable() * @generated */ - public static final int XML_SECONDARY_TABLE = 77; + public static final int XML_SECONDARY_TABLE = 75; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class. @@ -4596,7 +4540,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlSequenceGenerator() * @generated */ - public static final int XML_SEQUENCE_GENERATOR = 78; + public static final int XML_SEQUENCE_GENERATOR = 76; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class. @@ -4606,7 +4550,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping() * @generated */ - public static final int SQL_RESULT_SET_MAPPING = 79; + public static final int SQL_RESULT_SET_MAPPING = 77; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Xml Table</em>}' class. @@ -4616,7 +4560,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTable() * @generated */ - public static final int XML_TABLE = 80; + public static final int XML_TABLE = 78; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class. @@ -4626,7 +4570,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTableGenerator() * @generated */ - public static final int XML_TABLE_GENERATOR = 81; + public static final int XML_TABLE_GENERATOR = 79; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class. @@ -4636,7 +4580,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlTransient() * @generated */ - public static final int XML_TRANSIENT = 82; + public static final int XML_TRANSIENT = 80; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class. @@ -4646,7 +4590,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlUniqueConstraint() * @generated */ - public static final int XML_UNIQUE_CONSTRAINT = 84; + public static final int XML_UNIQUE_CONSTRAINT = 82; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Xml Version</em>}' class. @@ -4656,7 +4600,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlVersion() * @generated */ - public static final int XML_VERSION = 85; + public static final int XML_VERSION = 83; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOrderable <em>Xml Orderable</em>}' class. @@ -4666,7 +4610,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrderable() * @generated */ - public static final int XML_ORDERABLE = 61; + public static final int XML_ORDERABLE = 59; /** * The feature id for the '<em><b>Order Column</b></em>' containment reference. @@ -5612,7 +5556,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType() * @generated */ - public static final int ACCESS_TYPE = 86; + public static final int ACCESS_TYPE = 84; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum. @@ -5622,7 +5566,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType() * @generated */ - public static final int DISCRIMINATOR_TYPE = 87; + public static final int DISCRIMINATOR_TYPE = 85; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}' enum. @@ -5632,7 +5576,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType() * @generated */ - public static final int ENUM_TYPE = 88; + public static final int ENUM_TYPE = 86; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}' enum. @@ -5642,7 +5586,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType() * @generated */ - public static final int FETCH_TYPE = 89; + public static final int FETCH_TYPE = 87; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}' enum. @@ -5652,7 +5596,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType() * @generated */ - public static final int GENERATION_TYPE = 90; + public static final int GENERATION_TYPE = 88; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum. @@ -5662,7 +5606,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType() * @generated */ - public static final int INHERITANCE_TYPE = 91; + public static final int INHERITANCE_TYPE = 89; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum. @@ -5672,7 +5616,7 @@ public class OrmPackage extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType() * @generated */ - public static final int TEMPORAL_TYPE = 92; + public static final int TEMPORAL_TYPE = 90; /** * <!-- begin-user-doc --> @@ -5966,13 +5910,6 @@ public class OrmPackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlIdClassEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass xmlIdClassContainerEClass = null; /** @@ -6043,13 +5980,6 @@ public class OrmPackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlMapKeyClassEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass xmlMappedByMappingEClass = null; /** @@ -8287,33 +8217,6 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass <em>Xml Id Class</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Id Class</em>'. - * @see org.eclipse.jpt.core.resource.orm.XmlIdClass - * @generated - */ - public EClass getXmlIdClass() - { - return xmlIdClassEClass; - } - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass#getClassName <em>Class Name</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Class Name</em>'. - * @see org.eclipse.jpt.core.resource.orm.XmlIdClass#getClassName() - * @see #getXmlIdClass() - * @generated - */ - public EAttribute getXmlIdClass_ClassName() - { - return (EAttribute)xmlIdClassEClass.getEStructuralFeatures().get(0); - } - - /** * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlIdClassContainer <em>Xml Id Class Container</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -8544,19 +8447,6 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Map Key Class</em>'. - * @see org.eclipse.jpt.core.resource.orm.XmlMapKeyClass - * @generated - */ - public EClass getXmlMapKeyClass() - { - return xmlMapKeyClassEClass; - } - - /** * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlMappedByMapping <em>Xml Mapped By Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -9853,9 +9743,6 @@ public class OrmPackage extends EPackageImpl xmlIdEClass = createEClass(XML_ID); createEReference(xmlIdEClass, XML_ID__GENERATED_VALUE); - xmlIdClassEClass = createEClass(XML_ID_CLASS); - createEAttribute(xmlIdClassEClass, XML_ID_CLASS__CLASS_NAME); - xmlIdClassContainerEClass = createEClass(XML_ID_CLASS_CONTAINER); createEReference(xmlIdClassContainerEClass, XML_ID_CLASS_CONTAINER__ID_CLASS); @@ -9883,8 +9770,6 @@ public class OrmPackage extends EPackageImpl mapKeyEClass = createEClass(MAP_KEY); createEAttribute(mapKeyEClass, MAP_KEY__NAME); - xmlMapKeyClassEClass = createEClass(XML_MAP_KEY_CLASS); - xmlMappedByMappingEClass = createEClass(XML_MAPPED_BY_MAPPING); createEAttribute(xmlMappedByMappingEClass, XML_MAPPED_BY_MAPPING__MAPPED_BY); @@ -10096,7 +9981,6 @@ public class OrmPackage extends EPackageImpl xmlManyToManyEClass.getESuperTypes().add(this.getAbstractXmlMultiRelationshipMapping()); xmlManyToManyEClass.getESuperTypes().add(theOrmV2_0Package.getXmlManyToMany_2_0()); xmlManyToOneEClass.getESuperTypes().add(this.getAbstractXmlSingleRelationshipMapping()); - xmlMapKeyClassEClass.getESuperTypes().add(theOrmV2_0Package.getXmlMapKeyClass_2_0()); xmlMappedSuperclassEClass.getESuperTypes().add(this.getAbstractXmlTypeMapping()); xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlIdClassContainer()); xmlNamedNativeQueryEClass.getESuperTypes().add(this.getXmlQuery()); @@ -10319,11 +10203,8 @@ public class OrmPackage extends EPackageImpl initEClass(xmlIdEClass, XmlId.class, "XmlId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlId_GeneratedValue(), this.getXmlGeneratedValue(), null, "generatedValue", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlIdClassEClass, XmlIdClass.class, "XmlIdClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlIdClass_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlIdClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlIdClassContainerEClass, XmlIdClassContainer.class, "XmlIdClassContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlIdClassContainer_IdClass(), this.getXmlIdClass(), null, "idClass", null, 0, 1, XmlIdClassContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlIdClassContainer_IdClass(), this.getXmlClassReference(), null, "idClass", null, 0, 1, XmlIdClassContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(inheritanceEClass, Inheritance.class, "Inheritance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getInheritance_Strategy(), this.getInheritanceType(), "strategy", "SINGLE_TABLE", 0, 1, Inheritance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -10349,8 +10230,6 @@ public class OrmPackage extends EPackageImpl initEClass(mapKeyEClass, MapKey.class, "MapKey", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMapKey_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, MapKey.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlMapKeyClassEClass, XmlMapKeyClass.class, "XmlMapKeyClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(xmlMappedByMappingEClass, XmlMappedByMapping.class, "XmlMappedByMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlMappedByMapping_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, XmlMappedByMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -11686,24 +11565,6 @@ public class OrmPackage extends EPackageImpl public static final EReference XML_ID__GENERATED_VALUE = eINSTANCE.getXmlId_GeneratedValue(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClass <em>Xml Id Class</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.XmlIdClass - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass() - * @generated - */ - public static final EClass XML_ID_CLASS = eINSTANCE.getXmlIdClass(); - - /** - * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final EAttribute XML_ID_CLASS__CLASS_NAME = eINSTANCE.getXmlIdClass_ClassName(); - - /** * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClassContainer <em>Xml Id Class Container</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -11860,16 +11721,6 @@ public class OrmPackage extends EPackageImpl public static final EAttribute MAP_KEY__NAME = eINSTANCE.getMapKey_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.XmlMapKeyClass - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyClass() - * @generated - */ - public static final EClass XML_MAP_KEY_CLASS = eINSTANCE.getXmlMapKeyClass(); - - /** * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedByMapping <em>Xml Mapped By Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlClassReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlClassReference.java index 18eb140abc..26cad878dc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlClassReference.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlClassReference.java @@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.core.resource.xml.JpaEObject; +import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -199,22 +200,30 @@ public class XmlClassReference extends AbstractJpaEObject implements JpaEObject } + // **************** validation ******************************************** + + public TextRange getClassNameTextRange() { + return getAttributeTextRange(JPA.CLASS); + } + + // ********** translators ********** public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { return new SimpleTranslator( - elementName, - structuralFeature, - Translator.END_TAG_NO_INDENT, - buildTranslatorChildren()); + elementName, + structuralFeature, + Translator.END_TAG_NO_INDENT, + buildTranslatorChildren() + ); } - + private static Translator[] buildTranslatorChildren() { return new Translator[] { - buildClassTranslator()}; + buildClassTranslator()}; } private static Translator buildClassTranslator() { - return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlIdClass_ClassName(), Translator.DOM_ATTRIBUTE); + return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlClassReference_ClassName(), Translator.DOM_ATTRIBUTE); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java index 7d74ddab82..8c7d0cda08 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java @@ -211,7 +211,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements * @generated * @ordered */ - protected XmlMapKeyClass mapKeyClass; + protected XmlClassReference mapKeyClass; /** * changed this to null and removed the generated flag so emf won't generate over it @@ -723,12 +723,12 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Class</em>' containment reference. - * @see #setMapKeyClass(XmlMapKeyClass) + * @see #setMapKeyClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlElementCollection_2_0_MapKeyClass() * @model containment="true" * @generated */ - public XmlMapKeyClass getMapKeyClass() + public XmlClassReference getMapKeyClass() { return mapKeyClass; } @@ -738,9 +738,9 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetMapKeyClass(XmlMapKeyClass newMapKeyClass, NotificationChain msgs) + public NotificationChain basicSetMapKeyClass(XmlClassReference newMapKeyClass, NotificationChain msgs) { - XmlMapKeyClass oldMapKeyClass = mapKeyClass; + XmlClassReference oldMapKeyClass = mapKeyClass; mapKeyClass = newMapKeyClass; if (eNotificationRequired()) { @@ -758,7 +758,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements * @see #getMapKeyClass() * @generated */ - public void setMapKeyClass(XmlMapKeyClass newMapKeyClass) + public void setMapKeyClass(XmlClassReference newMapKeyClass) { if (newMapKeyClass != mapKeyClass) { @@ -1185,7 +1185,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements setMapKey((MapKey)newValue); return; case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS: - setMapKeyClass((XmlMapKeyClass)newValue); + setMapKeyClass((XmlClassReference)newValue); return; case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL: setMapKeyTemporal((TemporalType)newValue); @@ -1254,7 +1254,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements setMapKey((MapKey)null); return; case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS: - setMapKeyClass((XmlMapKeyClass)null); + setMapKeyClass((XmlClassReference)null); return; case OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL: setMapKeyTemporal(MAP_KEY_TEMPORAL_EDEFAULT); @@ -1609,7 +1609,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements } protected static Translator buildMapKeyClassTranslator() { - return XmlMapKeyClass.buildTranslator(JPA2_0.MAP_KEY_CLASS, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyClass()); + return XmlClassReference.buildTranslator(JPA2_0.MAP_KEY_CLASS, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyClass()); } protected static Translator buildMapKeyTemporalTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java index b3776b3f14..bb5764e55a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java @@ -222,7 +222,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain * @generated * @ordered */ - protected XmlIdClass idClass; + protected XmlClassReference idClass; /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -553,12 +553,12 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain * </p> * <!-- end-user-doc --> * @return the value of the '<em>Id Class</em>' containment reference. - * @see #setIdClass(XmlIdClass) + * @see #setIdClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClassContainer_IdClass() * @model containment="true" * @generated */ - public XmlIdClass getIdClass() + public XmlClassReference getIdClass() { return idClass; } @@ -568,9 +568,9 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetIdClass(XmlIdClass newIdClass, NotificationChain msgs) + public NotificationChain basicSetIdClass(XmlClassReference newIdClass, NotificationChain msgs) { - XmlIdClass oldIdClass = idClass; + XmlClassReference oldIdClass = idClass; idClass = newIdClass; if (eNotificationRequired()) { @@ -588,7 +588,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain * @see #getIdClass() * @generated */ - public void setIdClass(XmlIdClass newIdClass) + public void setIdClass(XmlClassReference newIdClass) { if (newIdClass != idClass) { @@ -1759,7 +1759,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain setCacheable((Boolean)newValue); return; case OrmPackage.XML_ENTITY__ID_CLASS: - setIdClass((XmlIdClass)newValue); + setIdClass((XmlClassReference)newValue); return; case OrmPackage.XML_ENTITY__NAME: setName((String)newValue); @@ -1854,7 +1854,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain setCacheable(CACHEABLE_EDEFAULT); return; case OrmPackage.XML_ENTITY__ID_CLASS: - setIdClass((XmlIdClass)null); + setIdClass((XmlClassReference)null); return; case OrmPackage.XML_ENTITY__NAME: setName(NAME_EDEFAULT); @@ -2227,7 +2227,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain } protected static Translator buildIdClassTranslator() { - return XmlIdClass.buildTranslator(JPA.ID_CLASS, OrmPackage.eINSTANCE.getXmlIdClassContainer_IdClass()); + return XmlClassReference.buildTranslator(JPA.ID_CLASS, OrmPackage.eINSTANCE.getXmlIdClassContainer_IdClass()); } protected static Translator buildInheritanceTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClass.java deleted file mode 100644 index fc6cab125d..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClass.java +++ /dev/null @@ -1,235 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.core.resource.orm; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.core.resource.xml.JpaEObject; -import org.eclipse.jpt.core.utility.TextRange; -import org.eclipse.wst.common.internal.emf.resource.Translator; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Id Class</b></em>'. - * - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.jpt.core.resource.orm.XmlIdClass#getClassName <em>Class Name</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass() - * @model kind="class" - * @extends JpaEObject - * @generated - */ -public class XmlIdClass extends AbstractJpaEObject implements JpaEObject -{ - /** - * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClassName() - * @generated - * @ordered - */ - protected static final String CLASS_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClassName() - * @generated - * @ordered - */ - protected String className = CLASS_NAME_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected XmlIdClass() - { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() - { - return OrmPackage.Literals.XML_ID_CLASS; - } - - /** - * Returns the value of the '<em><b>Class Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Class Name</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Class Name</em>' attribute. - * @see #setClassName(String) - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClass_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.core.resource.orm.XmlIdClass#getClassName <em>Class Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Class Name</em>' attribute. - * @see #getClassName() - * @generated - */ - public void setClassName(String newClassName) - { - String oldClassName = className; - className = newClassName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_ID_CLASS__CLASS_NAME, oldClassName, className)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case OrmPackage.XML_ID_CLASS__CLASS_NAME: - return getClassName(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case OrmPackage.XML_ID_CLASS__CLASS_NAME: - setClassName((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case OrmPackage.XML_ID_CLASS__CLASS_NAME: - setClassName(CLASS_NAME_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case OrmPackage.XML_ID_CLASS__CLASS_NAME: - return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (className: "); - result.append(className); - result.append(')'); - return result.toString(); - } - - - // **************** validation ******************************************** - - public TextRange getClassNameTextRange() { - return getAttributeTextRange(JPA.CLASS); - } - - - // **************** translators ******************************************* - - public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { - return new SimpleTranslator( - elementName, - structuralFeature, - Translator.END_TAG_NO_INDENT, - buildTranslatorChildren() - ); - } - - private static Translator[] buildTranslatorChildren() { - return new Translator[] { - buildClassTranslator() - }; - } - - protected static Translator buildClassTranslator() { - return new Translator(JPA.CLASS, OrmPackage.eINSTANCE.getXmlIdClass_ClassName(), Translator.DOM_ATTRIBUTE); - } - -} // IdClass diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClassContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClassContainer.java index 6547bfc676..6a508798b4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClassContainer.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlIdClassContainer.java @@ -41,12 +41,12 @@ public interface XmlIdClassContainer extends JpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Id Class</em>' containment reference. - * @see #setIdClass(XmlIdClass) + * @see #setIdClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClassContainer_IdClass() * @model containment="true" * @generated */ - XmlIdClass getIdClass(); + XmlClassReference getIdClass(); /** * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlIdClassContainer#getIdClass <em>Id Class</em>}' containment reference. @@ -56,6 +56,6 @@ public interface XmlIdClassContainer extends JpaEObject * @see #getIdClass() * @generated */ - void setIdClass(XmlIdClass value); + void setIdClass(XmlClassReference value); } // XmlIdClassContainer diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java index 16051a29fe..079f5753ad 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java @@ -93,7 +93,7 @@ public class XmlManyToMany extends AbstractXmlMultiRelationshipMapping implement } protected static Translator buildMapKeyClassTranslator() { - return XmlMapKeyClass.buildTranslator(JPA2_0.MAP_KEY_CLASS, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyClass()); + return XmlClassReference.buildTranslator(JPA2_0.MAP_KEY_CLASS, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyClass()); } protected static Translator buildMapKeyTemporalTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMapKeyClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMapKeyClass.java deleted file mode 100644 index 3c28ca98ce..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMapKeyClass.java +++ /dev/null @@ -1,211 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Oracle. - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jpt.core.resource.orm; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package; -import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0; -import org.eclipse.jpt.core.resource.xml.AbstractJpaEObject; -import org.eclipse.wst.common.internal.emf.resource.Translator; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Xml Map Key Class</b></em>'. - * <!-- end-user-doc --> - * - * - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyClass() - * @model kind="class" - * @generated - */ -public class XmlMapKeyClass extends AbstractJpaEObject implements XmlMapKeyClass_2_0 -{ - /** - * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClassName() - * @generated - * @ordered - */ - protected static final String CLASS_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClassName() - * @generated - * @ordered - */ - protected String className = CLASS_NAME_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected XmlMapKeyClass() - { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() - { - return OrmPackage.Literals.XML_MAP_KEY_CLASS; - } - - /** - * Returns the value of the '<em><b>Class Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Class Name</em>' attribute isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Class Name</em>' attribute. - * @see #setClassName(String) - * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlMapKeyClass_2_0_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.core.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Class Name</em>' attribute. - * @see #getClassName() - * @generated - */ - public void setClassName(String newClassName) - { - String oldClassName = className; - className = newClassName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, OrmPackage.XML_MAP_KEY_CLASS__CLASS_NAME, oldClassName, className)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case OrmPackage.XML_MAP_KEY_CLASS__CLASS_NAME: - return getClassName(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case OrmPackage.XML_MAP_KEY_CLASS__CLASS_NAME: - setClassName((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case OrmPackage.XML_MAP_KEY_CLASS__CLASS_NAME: - setClassName(CLASS_NAME_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case OrmPackage.XML_MAP_KEY_CLASS__CLASS_NAME: - return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (className: "); - result.append(className); - result.append(')'); - return result.toString(); - } - - - // ********** translators ********** - - public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { - return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren()); - } - - private static Translator[] buildTranslatorChildren() { - return new Translator[] { - buildClassNameTranslator() - }; - } - - protected static Translator buildClassNameTranslator() { - return new Translator(JPA.CLASS, OrmV2_0Package.eINSTANCE.getXmlMapKeyClass_2_0_ClassName(), Translator.DOM_ATTRIBUTE); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java index 61be312a95..8591673e81 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java @@ -55,7 +55,7 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId * @generated * @ordered */ - protected XmlIdClass idClass; + protected XmlClassReference idClass; /** * The default value of the '{@link #isExcludeDefaultListeners() <em>Exclude Default Listeners</em>}' attribute. @@ -145,12 +145,12 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId * </p> * <!-- end-user-doc --> * @return the value of the '<em>Id Class</em>' containment reference. - * @see #setIdClass(XmlIdClass) + * @see #setIdClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlIdClassContainer_IdClass() * @model containment="true" * @generated */ - public XmlIdClass getIdClass() + public XmlClassReference getIdClass() { return idClass; } @@ -160,9 +160,9 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetIdClass(XmlIdClass newIdClass, NotificationChain msgs) + public NotificationChain basicSetIdClass(XmlClassReference newIdClass, NotificationChain msgs) { - XmlIdClass oldIdClass = idClass; + XmlClassReference oldIdClass = idClass; idClass = newIdClass; if (eNotificationRequired()) { @@ -180,7 +180,7 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId * @see #getIdClass() * @generated */ - public void setIdClass(XmlIdClass newIdClass) + public void setIdClass(XmlClassReference newIdClass) { if (newIdClass != idClass) { @@ -377,7 +377,7 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId switch (featureID) { case OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS: - setIdClass((XmlIdClass)newValue); + setIdClass((XmlClassReference)newValue); return; case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS: setExcludeDefaultListeners((Boolean)newValue); @@ -403,7 +403,7 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId switch (featureID) { case OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS: - setIdClass((XmlIdClass)null); + setIdClass((XmlClassReference)null); return; case OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS: setExcludeDefaultListeners(EXCLUDE_DEFAULT_LISTENERS_EDEFAULT); @@ -529,7 +529,7 @@ public class XmlMappedSuperclass extends AbstractXmlTypeMapping implements XmlId } protected static Translator buildIdClassTranslator() { - return XmlIdClass.buildTranslator(JPA.ID_CLASS, OrmPackage.eINSTANCE.getXmlIdClassContainer_IdClass()); + return XmlClassReference.buildTranslator(JPA.ID_CLASS, OrmPackage.eINSTANCE.getXmlIdClassContainer_IdClass()); } protected static Translator buildExcludeDefaultListenersTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java index ff9da773cf..e03ed050a3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java @@ -387,7 +387,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements } protected static Translator buildMapKeyClassTranslator() { - return XmlMapKeyClass.buildTranslator(JPA2_0.MAP_KEY_CLASS, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyClass()); + return XmlClassReference.buildTranslator(JPA2_0.MAP_KEY_CLASS, OrmV2_0Package.eINSTANCE.getXmlMultiRelationshipMapping_2_0_MapKeyClass()); } protected static Translator buildMapKeyAttributeOverrideTranslator() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java index ca6db538df..887d05594d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java @@ -644,7 +644,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrderable_2_0() * @generated */ - public static final int XML_ORDERABLE_20 = 22; + public static final int XML_ORDERABLE_20 = 21; /** * The feature id for the '<em><b>Order Column</b></em>' containment reference. @@ -672,7 +672,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMultiRelationshipMapping_2_0() * @generated */ - public static final int XML_MULTI_RELATIONSHIP_MAPPING_20 = 18; + public static final int XML_MULTI_RELATIONSHIP_MAPPING_20 = 17; /** * The feature id for the '<em><b>Order Column</b></em>' containment reference. @@ -857,34 +857,6 @@ public class OrmV2_0Package extends EPackageImpl public static final int XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 - * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyClass_2_0() - * @generated - */ - public static final int XML_MAP_KEY_CLASS_20 = 16; - - /** - * The feature id for the '<em><b>Class Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int XML_MAP_KEY_CLASS_20__CLASS_NAME = 0; - - /** - * The number of structural features of the '<em>Xml Map Key Class 20</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int XML_MAP_KEY_CLASS_20_FEATURE_COUNT = 1; - - /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0 <em>Xml Maps Id 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -892,7 +864,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapsId_2_0() * @generated */ - public static final int XML_MAPS_ID_20 = 17; + public static final int XML_MAPS_ID_20 = 16; /** * The feature id for the '<em><b>Maps Id</b></em>' attribute. @@ -920,7 +892,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlNamedQuery_2_0() * @generated */ - public static final int XML_NAMED_QUERY_20 = 19; + public static final int XML_NAMED_QUERY_20 = 18; /** * The feature id for the '<em><b>Lock Mode</b></em>' attribute. @@ -948,7 +920,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0() * @generated */ - public static final int XML_ORPHAN_REMOVABLE_20 = 24; + public static final int XML_ORPHAN_REMOVABLE_20 = 23; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}' class. @@ -958,7 +930,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOneToMany_2_0() * @generated */ - public static final int XML_ONE_TO_MANY_20 = 20; + public static final int XML_ONE_TO_MANY_20 = 19; /** * The feature id for the '<em><b>Order Column</b></em>' containment reference. @@ -1049,7 +1021,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSingleRelationshipMapping_2_0() * @generated */ - public static final int XML_SINGLE_RELATIONSHIP_MAPPING_20 = 30; + public static final int XML_SINGLE_RELATIONSHIP_MAPPING_20 = 29; /** * The feature id for the '<em><b>Id</b></em>' attribute. @@ -1086,7 +1058,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOneToOne_2_0() * @generated */ - public static final int XML_ONE_TO_ONE_20 = 21; + public static final int XML_ONE_TO_ONE_20 = 20; /** * The feature id for the '<em><b>Id</b></em>' attribute. @@ -1132,7 +1104,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrderColumn_2_0() * @generated */ - public static final int XML_ORDER_COLUMN_20 = 23; + public static final int XML_ORDER_COLUMN_20 = 22; /** * The feature id for the '<em><b>Nullable</b></em>' attribute. @@ -1178,7 +1150,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitDefaults_2_0() * @generated */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20 = 25; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS_20 = 24; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlPersistenceUnitMetadata_2_0 <em>Xml Persistence Unit Metadata 20</em>}' class. @@ -1188,7 +1160,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlPersistenceUnitMetadata_2_0() * @generated */ - public static final int XML_PERSISTENCE_UNIT_METADATA_20 = 26; + public static final int XML_PERSISTENCE_UNIT_METADATA_20 = 25; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlQuery_2_0 <em>Xml Query 20</em>}' class. @@ -1198,7 +1170,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlQuery_2_0() * @generated */ - public static final int XML_QUERY_20 = 27; + public static final int XML_QUERY_20 = 26; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlQueryHint_2_0 <em>Xml Query Hint 20</em>}' class. @@ -1208,7 +1180,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlQueryHint_2_0() * @generated */ - public static final int XML_QUERY_HINT_20 = 28; + public static final int XML_QUERY_HINT_20 = 27; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSequenceGenerator_2_0 <em>Xml Sequence Generator 20</em>}' class. @@ -1218,7 +1190,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSequenceGenerator_2_0() * @generated */ - public static final int XML_SEQUENCE_GENERATOR_20 = 29; + public static final int XML_SEQUENCE_GENERATOR_20 = 28; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSqlResultSetMapping_2_0 <em>Xml Sql Result Set Mapping 20</em>}' class. @@ -1228,7 +1200,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlSqlResultSetMapping_2_0() * @generated */ - public static final int XML_SQL_RESULT_SET_MAPPING_20 = 31; + public static final int XML_SQL_RESULT_SET_MAPPING_20 = 30; /** * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlUniqueConstraint_2_0 <em>Xml Unique Constraint 20</em>}' class. @@ -1238,7 +1210,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlUniqueConstraint_2_0() * @generated */ - public static final int XML_UNIQUE_CONSTRAINT_20 = 32; + public static final int XML_UNIQUE_CONSTRAINT_20 = 31; /** * The feature id for the '<em><b>Orphan Removal</b></em>' attribute. @@ -1410,7 +1382,7 @@ public class OrmV2_0Package extends EPackageImpl * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getLockModeType_2_0() * @generated */ - public static final int LOCK_MODE_TYPE_20 = 33; + public static final int LOCK_MODE_TYPE_20 = 32; /** * <!-- begin-user-doc --> @@ -1515,13 +1487,6 @@ public class OrmV2_0Package extends EPackageImpl * <!-- end-user-doc --> * @generated */ - private EClass xmlMapKeyClass_2_0EClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ private EClass xmlMapsId_2_0EClass = null; /** @@ -2229,35 +2194,6 @@ public class OrmV2_0Package extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for class '<em>Xml Map Key Class 20</em>'. - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 - * @generated - */ - public EClass getXmlMapKeyClass_2_0() - { - return xmlMapKeyClass_2_0EClass; - } - - - /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0#getClassName <em>Class Name</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Class Name</em>'. - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0#getClassName() - * @see #getXmlMapKeyClass_2_0() - * @generated - */ - public EAttribute getXmlMapKeyClass_2_0_ClassName() - { - return (EAttribute)xmlMapKeyClass_2_0EClass.getEStructuralFeatures().get(0); - } - - - /** * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0 <em>Xml Maps Id 20</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2952,9 +2888,6 @@ public class OrmV2_0Package extends EPackageImpl xmlMapKeyAttributeOverrideContainer_2_0EClass = createEClass(XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20); createEReference(xmlMapKeyAttributeOverrideContainer_2_0EClass, XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES); - xmlMapKeyClass_2_0EClass = createEClass(XML_MAP_KEY_CLASS_20); - createEAttribute(xmlMapKeyClass_2_0EClass, XML_MAP_KEY_CLASS_20__CLASS_NAME); - xmlMapsId_2_0EClass = createEClass(XML_MAPS_ID_20); createEAttribute(xmlMapsId_2_0EClass, XML_MAPS_ID_20__MAPS_ID); @@ -3093,7 +3026,7 @@ public class OrmV2_0Package extends EPackageImpl initEAttribute(getXmlElementCollection_2_0_TargetClass(), theXMLTypePackage.getString(), "targetClass", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlElementCollection_2_0_Fetch(), theOrmPackage.getFetchType(), "fetch", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlElementCollection_2_0_MapKey(), theOrmPackage.getMapKey(), null, "mapKey", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getXmlElementCollection_2_0_MapKeyClass(), theOrmPackage.getXmlMapKeyClass(), null, "mapKeyClass", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlElementCollection_2_0_MapKeyClass(), theOrmPackage.getXmlClassReference(), null, "mapKeyClass", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlElementCollection_2_0_MapKeyTemporal(), theOrmPackage.getTemporalType(), "mapKeyTemporal", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlElementCollection_2_0_MapKeyEnumerated(), theOrmPackage.getEnumType(), "mapKeyEnumerated", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlElementCollection_2_0_MapKeyColumn(), theOrmPackage.getXmlColumn(), null, "mapKeyColumn", null, 0, 1, XmlElementCollection_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3119,14 +3052,11 @@ public class OrmV2_0Package extends EPackageImpl initEClass(xmlMapKeyAttributeOverrideContainer_2_0EClass, XmlMapKeyAttributeOverrideContainer_2_0.class, "XmlMapKeyAttributeOverrideContainer_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides(), theOrmPackage.getXmlAttributeOverride(), null, "mapKeyAttributeOverrides", null, 0, -1, XmlMapKeyAttributeOverrideContainer_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlMapKeyClass_2_0EClass, XmlMapKeyClass_2_0.class, "XmlMapKeyClass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getXmlMapKeyClass_2_0_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, XmlMapKeyClass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(xmlMapsId_2_0EClass, XmlMapsId_2_0.class, "XmlMapsId_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlMapsId_2_0_MapsId(), theXMLTypePackage.getString(), "mapsId", null, 0, 1, XmlMapsId_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlMultiRelationshipMapping_2_0EClass, XmlMultiRelationshipMapping_2_0.class, "XmlMultiRelationshipMapping_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyClass(), theOrmPackage.getXmlMapKeyClass(), null, "mapKeyClass", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyClass(), theOrmPackage.getXmlClassReference(), null, "mapKeyClass", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlMultiRelationshipMapping_2_0_MapKeyTemporal(), theOrmPackage.getTemporalType(), "mapKeyTemporal", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlMultiRelationshipMapping_2_0_MapKeyEnumerated(), theOrmPackage.getEnumType(), "mapKeyEnumerated", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlMultiRelationshipMapping_2_0_MapKeyColumn(), theOrmPackage.getXmlColumn(), null, "mapKeyColumn", null, 0, 1, XmlMultiRelationshipMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3502,24 +3432,6 @@ public class OrmV2_0Package extends EPackageImpl public static final EReference XML_MAP_KEY_ATTRIBUTE_OVERRIDE_CONTAINER_20__MAP_KEY_ATTRIBUTE_OVERRIDES = eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 <em>Xml Map Key Class 20</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlMapKeyClass_2_0 - * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMapKeyClass_2_0() - * @generated - */ - public static final EClass XML_MAP_KEY_CLASS_20 = eINSTANCE.getXmlMapKeyClass_2_0(); - - /** - * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final EAttribute XML_MAP_KEY_CLASS_20__CLASS_NAME = eINSTANCE.getXmlMapKeyClass_2_0_ClassName(); - - /** * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0 <em>Xml Maps Id 20</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java index b682829e82..d92f42b8c3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlElementCollection_2_0.java @@ -18,11 +18,11 @@ import org.eclipse.jpt.core.resource.orm.MapKey; import org.eclipse.jpt.core.resource.orm.TemporalType; import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer; import org.eclipse.jpt.core.resource.orm.XmlAttributeOverrideContainer; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlCollectionTable; import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping; import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; import org.eclipse.jpt.core.resource.orm.XmlOrderable; import org.eclipse.jpt.core.utility.TextRange; @@ -149,12 +149,12 @@ public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrde * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Class</em>' containment reference. - * @see #setMapKeyClass(XmlMapKeyClass) + * @see #setMapKeyClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlElementCollection_2_0_MapKeyClass() * @model containment="true" * @generated */ - XmlMapKeyClass getMapKeyClass(); + XmlClassReference getMapKeyClass(); /** * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlElementCollection_2_0#getMapKeyClass <em>Map Key Class</em>}' containment reference. @@ -164,7 +164,7 @@ public interface XmlElementCollection_2_0 extends XmlConvertibleMapping, XmlOrde * @see #getMapKeyClass() * @generated */ - void setMapKeyClass(XmlMapKeyClass value); + void setMapKeyClass(XmlClassReference value); /** * Returns the value of the '<em><b>Map Key Temporal</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java index 367825cbea..3b0955a969 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlMultiRelationshipMapping_2_0.java @@ -11,12 +11,11 @@ package org.eclipse.jpt.core.resource.orm.v2_0; import org.eclipse.emf.common.util.EList; - import org.eclipse.jpt.core.resource.orm.EnumType; import org.eclipse.jpt.core.resource.orm.TemporalType; +import org.eclipse.jpt.core.resource.orm.XmlClassReference; import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; -import org.eclipse.jpt.core.resource.orm.XmlMapKeyClass; /** * <!-- begin-user-doc --> @@ -55,12 +54,12 @@ public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0, XmlMa * </p> * <!-- end-user-doc --> * @return the value of the '<em>Map Key Class</em>' containment reference. - * @see #setMapKeyClass(XmlMapKeyClass) + * @see #setMapKeyClass(XmlClassReference) * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlMultiRelationshipMapping_2_0_MapKeyClass() * @model containment="true" * @generated */ - XmlMapKeyClass getMapKeyClass(); + XmlClassReference getMapKeyClass(); /** * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlMultiRelationshipMapping_2_0#getMapKeyClass <em>Map Key Class</em>}' containment reference. @@ -70,7 +69,7 @@ public interface XmlMultiRelationshipMapping_2_0 extends XmlOrderable_2_0, XmlMa * @see #getMapKeyClass() * @generated */ - void setMapKeyClass(XmlMapKeyClass value); + void setMapKeyClass(XmlClassReference value); /** * Returns the value of the '<em><b>Map Key Temporal</b></em>' attribute. |