diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org')
163 files changed, 393 insertions, 532 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java index dff541d1e2..120ffcd84d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; /** * EclipseLink JPA project. @@ -33,6 +33,6 @@ public interface EclipseLinkJpaProject * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings#DEFAULT_RUNTIME_PATH * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings#CONTENT_TYPE */ - JpaXmlResource getDefaultEclipseLinkOrmXmlResource(); + JptXmlResource getDefaultEclipseLinkOrmXmlResource(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java index 4d16305210..34b0b6dbf2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.internal.AbstractJpaProject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings; @@ -26,8 +26,8 @@ public class EclipseLinkJpaProjectImpl super(config); } - public JpaXmlResource getDefaultEclipseLinkOrmXmlResource() { - return (JpaXmlResource) this.getResourceModel( + public JptXmlResource getDefaultEclipseLinkOrmXmlResource() { + return (JptXmlResource) this.getResourceModel( XmlEntityMappings.DEFAULT_RUNTIME_PATH, XmlEntityMappings.CONTENT_TYPE); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java index 8887127999..6bf4460f68 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaResourceModelProvider; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings; @@ -47,7 +47,7 @@ public class EclipseLinkOrmResourceModelProvider return XmlEntityMappings.CONTENT_TYPE; } - public JpaXmlResource buildResourceModel(JpaProject jpaProject, IFile file) { + public JptXmlResource buildResourceModel(JpaProject jpaProject, IFile file) { return EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(file).getXmlResource(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java index 5387a40af9..fde3a65afb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java index d3bafb7689..7cae60377e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java index de6f3372cc..986bc91334 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java index c80019d987..e702234488 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmPersistenceUnitMetadata; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkPersistenceUnitDefaults; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java index 1bb4feb601..67a3ad6fca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java index 09433a4f5f..6ff34224e4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java index 47b4d86172..a1043c7100 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.emf.ecore.EFactory; +import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java index 22922d19ea..f69a89568c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java @@ -31,10 +31,10 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; import org.eclipse.jpt.common.core.internal.gen.AbstractJptGenerator; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlEnumValue; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.db.ConnectionProfile; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Connection; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization; @@ -324,13 +324,13 @@ public abstract class AbstractEclipseLinkDDLGenerator extends AbstractJptGenerat } private IPath getMetaInfPath() { - JpaXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource(); + JptXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource(); IPath persistenceXmlPath = persistenceXmlResource.getFile().getLocation(); return persistenceXmlPath.removeLastSegments(2); } private boolean metaInfIsNotOnClasspath() { - JpaXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource(); + JptXmlResource persistenceXmlResource = this.jpaProject.getPersistenceXmlResource(); return ! this.jpaProject.getJavaProject().isOnClasspath(persistenceXmlResource.getFile()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java index 4ea778af34..45a1712ea2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.operations; import org.eclipse.core.resources.IFile; +import org.eclipse.jpt.common.core.resource.xml.JpaXmlResourceProvider; import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationOperation; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResourceProvider; import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java index d2d9511e38..10e19b307e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; +import org.eclipse.jpt.common.core.internal.resource.xml.AbstractJptXmlResourceProvider; import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProperties; -import org.eclipse.jpt.jpa.core.internal.resource.xml.AbstractJpaXmlResourceProvider; import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults; import org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; public class EclipseLinkOrmXmlResourceProvider - extends AbstractJpaXmlResourceProvider + extends AbstractJptXmlResourceProvider implements OrmFileCreationDataModelProperties { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java index 94e3902367..9bdba300c6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java @@ -20,10 +20,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; @@ -31,6 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java index 9b70592b72..d32e56acfc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java @@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; @@ -8302,7 +8301,6 @@ public class EclipseLinkOrmPackage extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java index ce0b3e6aed..8f4a8e4797 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.util.URI; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.RendererFactory; import org.eclipse.wst.common.internal.emf.resource.TranslatorResource; @@ -46,6 +46,6 @@ public class EclipseLinkOrmXmlResourceFactory extends TranslatorResourceFactory */ @Override protected TranslatorResource createResource(URI uri, Renderer renderer) { - return new JpaXmlResource(uri, renderer, XmlEntityMappings.CONTENT_TYPE, XmlEntityMappings.getRootTranslator()); + return new JptXmlResource(uri, renderer, XmlEntityMappings.CONTENT_TYPE, XmlEntityMappings.getRootTranslator()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java index afbd13c1f4..b182071e80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -41,10 +41,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlAccessMethods extends AbstractJpaEObject implements JpaEObject +public class XmlAccessMethods extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getGetMethod() <em>Get Method</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java index 6e33a0f918..f9a0f86ad2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -26,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlAccessMethodsHolder extends JpaEObject +public interface XmlAccessMethodsHolder extends EBaseObject { /** * Returns the value of the '<em><b>Access Methods</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java index 15d23edb6f..271ba4bad0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2; @@ -36,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlAdditionalCriteria extends AbstractJpaEObject implements XmlAdditionalCriteria_2_2 +public class XmlAdditionalCriteria extends EBaseObjectImpl implements XmlAdditionalCriteria_2_2 { /** * The default value of the '{@link #getCriteria() <em>Criteria</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java index a7301e857d..ff340763ed 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java @@ -10,15 +10,11 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; @@ -44,7 +40,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlBatchFetch extends AbstractJpaEObject implements XmlBatchFetch_2_1 +public class XmlBatchFetch extends EBaseObjectImpl implements XmlBatchFetch_2_1 { /** * The default value of the '{@link #getSize() <em>Size</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java index a1b6747965..5b85c75e01 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlBatchFetchHolder extends JpaEObject +public interface XmlBatchFetchHolder extends EBaseObject { /** * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java index 3577450bd2..ad410d4553 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.CacheIsolationType; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; @@ -63,7 +63,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlCache extends AbstractJpaEObject implements XmlCache_2_2, XmlCache_2_4 +public class XmlCache extends EBaseObjectImpl implements XmlCache_2_2, XmlCache_2_4 { /** * changed this to null and removed the generated flag so emf won't generate over it diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java index f0a5c0de09..540fd14e25 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCacheHolder extends JpaEObject +public interface XmlCacheHolder extends EBaseObject { /** * Returns the value of the '<em><b>Cache</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java index aa252f224c..48484bade5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java @@ -11,17 +11,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import java.util.Collection; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.ecore.util.EDataTypeEList; - import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4; @@ -37,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlCacheIndex extends AbstractJpaEObject implements XmlCacheIndex_2_4 +public class XmlCacheIndex extends EBaseObjectImpl implements XmlCacheIndex_2_4 { /** * The cached value of the '{@link #getColumnNames() <em>Column Names</em>}' attribute list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java index e82bb7751e..5efa7df2bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -44,10 +44,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlChangeTracking extends AbstractJpaEObject implements JpaEObject +public class XmlChangeTracking extends EBaseObjectImpl implements EBaseObject { /** * changed this to null and removed the generated flag so emf won't generate over it diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java index 3144406326..53c62a6e36 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlChangeTrackingHolder extends JpaEObject +public interface XmlChangeTrackingHolder extends EBaseObject { /** * Returns the value of the '<em><b>Change Tracking</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java index 772affa448..63a7eacc37 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -44,10 +44,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlCloneCopyPolicy extends AbstractJpaEObject implements JpaEObject +public class XmlCloneCopyPolicy extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getMethod() <em>Method</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java index ec331f1139..cd7b4d6aab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java index d746c9261e..28d7535bd6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java @@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -46,10 +46,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject +public class XmlConversionValue extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getDataValue() <em>Data Value</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java index 17fa83b728..52643b9daf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterContainer.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -41,10 +41,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterContainer() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlConverterContainer extends JpaEObject +public interface XmlConverterContainer extends EBaseObject { /** * Returns the value of the '<em><b>Converters</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java index 9b21b431a1..aa05d6bb09 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -43,10 +43,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlCopyPolicy extends AbstractJpaEObject implements JpaEObject +public class XmlCopyPolicy extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getClass_() <em>Class</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java index 89c35476dd..d842b4d633 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java @@ -10,13 +10,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; /** * <!-- begin-user-doc --> @@ -41,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlCustomizer extends AbstractJpaEObject implements JpaEObject +public class XmlCustomizer extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getCustomizerClassName() <em>Customizer Class Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java index 65349782cb..2cf21f0117 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCustomizerHolder extends JpaEObject +public interface XmlCustomizerHolder extends EBaseObject { /** * Returns the value of the '<em><b>Customizer</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java index 7c1634c716..3db0beade3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java @@ -20,13 +20,13 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; -import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java index a2f8b6000f..cc3bbe914c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java @@ -52,6 +52,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPart import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3; @@ -66,7 +67,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java index 0a3bde590a..fe964a2c0e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1; @@ -32,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlFetchAttribute extends AbstractJpaEObject implements XmlFetchAttribute_2_1 +public class XmlFetchAttribute extends EBaseObjectImpl implements XmlFetchAttribute_2_1 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java index 292ffda1c6..d95739c98e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java @@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1; @@ -39,7 +39,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2_1 +public class XmlFetchGroup extends EBaseObjectImpl implements XmlFetchGroup_2_1 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java index 1d4dc2d5c4..cc9ed7f17f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlField extends AbstractJpaEObject implements XmlField_2_4 +public class XmlField extends EBaseObjectImpl implements XmlField_2_4 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java index 0a4f63c6ae..a3b5f4b7fc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlHashPartitioning extends AbstractJpaEObject implements XmlHashPartitioning_2_2 +public class XmlHashPartitioning extends EBaseObjectImpl implements XmlHashPartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java index 35a950e5b4..8bd9c1cbd4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EDataTypeEList; import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2; @@ -40,7 +40,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlIndex extends AbstractJpaEObject implements XmlIndex_2_2 +public class XmlIndex extends EBaseObjectImpl implements XmlIndex_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java index 6b87d945a7..5a1597012e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java @@ -13,8 +13,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -35,10 +35,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlInstantiationCopyPolicy extends AbstractJpaEObject implements JpaEObject +public class XmlInstantiationCopyPolicy extends EBaseObjectImpl implements EBaseObject { /** * <!-- begin-user-doc --> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java index ff86a6f6a6..9135955dd6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlJoinFetch extends JpaEObject +public interface XmlJoinFetch extends EBaseObject { /** * Returns the value of the '<em><b>Join Fetch</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java index 92cb8d0b17..c1904bf79c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java @@ -10,15 +10,11 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlJoinField extends AbstractJpaEObject implements XmlJoinField_2_4 +public class XmlJoinField extends EBaseObjectImpl implements XmlJoinField_2_4 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java index dae31a93cf..2130b58880 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java index 85691e246a..721b00a218 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java @@ -20,6 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator; +import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.resource.orm.JPA; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; @@ -40,9 +43,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4; -import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator; -import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java index 38145dc5ac..7428a0a52e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java @@ -62,6 +62,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPart import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3; @@ -74,7 +75,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.wst.common.internal.emf.resource.Translator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java index 570a636fcd..d5d3206ee7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java @@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; @@ -43,7 +43,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlMultitenant extends AbstractJpaEObject implements XmlMultitenant_2_3, XmlMultitenant_2_4 +public class XmlMultitenant extends EBaseObjectImpl implements XmlMultitenant_2_3, XmlMultitenant_2_4 { /** * changed this to null and removed the generated flag so emf won't generate over it diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java index 02bcea382f..6ee8fbd001 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenantHolder.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenantHolder() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlMultitenantHolder extends JpaEObject +public interface XmlMultitenantHolder extends EBaseObject { /** * Returns the value of the '<em><b>Multitenant</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java index 8d79dbdb82..59bbc606c6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlMutable extends JpaEObject +public interface XmlMutable extends EBaseObject { /** * Returns the value of the '<em><b>Mutable</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java index 04602b05dc..7dfa55f740 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java @@ -13,10 +13,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -44,10 +44,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlNamedConverter extends AbstractJpaEObject implements JpaEObject +public class XmlNamedConverter extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java index d408d33c2a..964ad620ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.EStructuralFeature; - +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3; @@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlNamedPlsqlStoredFunctionQuery extends AbstractJpaEObject implements XmlNamedPlsqlStoredFunctionQuery_2_3 +public class XmlNamedPlsqlStoredFunctionQuery extends EBaseObjectImpl implements XmlNamedPlsqlStoredFunctionQuery_2_3 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java index 50af5ce82d..557b97030e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.EStructuralFeature; - +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3; @@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlNamedPlsqlStoredProcedureQuery extends AbstractJpaEObject implements XmlNamedPlsqlStoredProcedureQuery_2_3 +public class XmlNamedPlsqlStoredProcedureQuery extends EBaseObjectImpl implements XmlNamedPlsqlStoredProcedureQuery_2_3 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java index 771ec817ce..23c00d1da0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.EStructuralFeature; - +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3; @@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlNamedStoredFunctionQuery extends AbstractJpaEObject implements XmlNamedStoredFunctionQuery_2_3 +public class XmlNamedStoredFunctionQuery extends EBaseObjectImpl implements XmlNamedStoredFunctionQuery_2_3 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java index 12be339a21..17b66966d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.XmlQueryHint; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -57,10 +57,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlNamedStoredProcedureQuery extends AbstractJpaEObject implements JpaEObject +public class XmlNamedStoredProcedureQuery extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java index 16eb311484..1e87b64d5b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java @@ -10,15 +10,11 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; @@ -35,7 +31,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlNoSql extends AbstractJpaEObject implements XmlNoSql_2_4 +public class XmlNoSql extends EBaseObjectImpl implements XmlNoSql_2_4 { /** * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java index 2729911d8c..b94f1fe3bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java @@ -20,6 +20,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator; +import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.resource.orm.CascadeType; import org.eclipse.jpt.jpa.core.resource.orm.JPA; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; @@ -41,9 +44,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4; -import org.eclipse.jpt.common.core.internal.utility.translators.EmptyTagBooleanTranslator; -import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.wst.common.internal.emf.resource.Translator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java index 2a10792549..a881f3c721 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -53,10 +53,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlOptimisticLocking extends AbstractJpaEObject implements JpaEObject +public class XmlOptimisticLocking extends EBaseObjectImpl implements EBaseObject { /** * changed this to null and removed the generated flag so emf won't generate over it diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java index 314ca5d908..be862dc95e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlPartitioning extends AbstractJpaEObject implements XmlPartitioning_2_2 +public class XmlPartitioning extends EBaseObjectImpl implements XmlPartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java index 9dedcb8ce9..6e63a219d4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java @@ -12,14 +12,11 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java index 49d3b010cf..b34b9182cb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlPinnedPartitioning extends AbstractJpaEObject implements XmlPinnedPartitioning_2_2 +public class XmlPinnedPartitioning extends EBaseObjectImpl implements XmlPinnedPartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java index 0e11f9a16e..28674465bd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.EStructuralFeature; - +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3; @@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlPlsqlRecord extends AbstractJpaEObject implements XmlPlsqlRecord_2_3 +public class XmlPlsqlRecord extends EBaseObjectImpl implements XmlPlsqlRecord_2_3 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java index 9933871f4d..172b8fbef1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.EStructuralFeature; - +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3; @@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlPlsqlTable extends AbstractJpaEObject implements XmlPlsqlTable_2_3 +public class XmlPlsqlTable extends EBaseObjectImpl implements XmlPlsqlTable_2_3 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java index 6344aa61f3..86f48d051a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java @@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1; @@ -44,7 +44,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1_1, XmlPrimaryKey_2_1 +public class XmlPrimaryKey extends EBaseObjectImpl implements XmlPrimaryKey_1_1, XmlPrimaryKey_2_1 { /** * changed this to null and removed the generated flag so emf won't generate over it diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java index 98d1914012..0b2f753406 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPrivateOwned extends JpaEObject +public interface XmlPrivateOwned extends EBaseObject { /** * Returns the value of the '<em><b>Private Owned</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java index 7b064d3e1b..e609273886 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -35,10 +35,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlProperty extends AbstractJpaEObject implements JpaEObject +public class XmlProperty extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java index 3eba00d2c0..d2c419a670 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPropertyContainer extends JpaEObject +public interface XmlPropertyContainer extends EBaseObject { /** * Returns the value of the '<em><b>Properties</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java index 4afab0cb94..57b9cc346c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlQueryContainer extends JpaEObject +public interface XmlQueryContainer extends EBaseObject { /** * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java index a2b1e96876..169a0b4a97 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0; @@ -36,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryRedirectors_2_0 +public class XmlQueryRedirectors extends EBaseObjectImpl implements XmlQueryRedirectors_2_0 { /** * The default value of the '{@link #getAllQueries() <em>All Queries</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java index b168ad07ef..49377aef3c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlRangePartitioning extends AbstractJpaEObject implements XmlRangePartitioning_2_2 +public class XmlRangePartitioning extends EBaseObjectImpl implements XmlRangePartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java index b4f928abf0..899e07a833 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlReadOnly extends JpaEObject +public interface XmlReadOnly extends EBaseObject { /** * Returns the value of the '<em><b>Read Only</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java index 14607841ff..0331fb455e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlReplicationPartitioning extends AbstractJpaEObject implements XmlReplicationPartitioning_2_2 +public class XmlReplicationPartitioning extends EBaseObjectImpl implements XmlReplicationPartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java index 0762f0007a..5ad7b59c8c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1; @@ -32,7 +32,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlReturnInsert extends AbstractJpaEObject implements XmlReturnInsert_2_1 +public class XmlReturnInsert extends EBaseObjectImpl implements XmlReturnInsert_2_1 { /** * The default value of the '{@link #getReturnOnly() <em>Return Only</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java index d67d354ab8..d3cf18d9a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlRoundRobinPartitioning extends AbstractJpaEObject implements XmlRoundRobinPartitioning_2_2 +public class XmlRoundRobinPartitioning extends EBaseObjectImpl implements XmlRoundRobinPartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java index 502d043f47..3677138a76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java index 4c219d0fc0..e7860def11 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -48,10 +48,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlStoredProcedureParameter extends AbstractJpaEObject implements JpaEObject +public class XmlStoredProcedureParameter extends EBaseObjectImpl implements EBaseObject { /** * changed this to null and removed the generated flag so emf won't generate over it diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java index 498236b916..d9d26f679a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.EStructuralFeature; - +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3; @@ -32,7 +30,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlStruct extends AbstractJpaEObject implements XmlStruct_2_3 +public class XmlStruct extends EBaseObjectImpl implements XmlStruct_2_3 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java index 33d9d07657..7edd8aecdb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java index a314c639bb..115797dea8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.jpa.core.resource.orm.JPA; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java index abf699f18e..61428f87b5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java @@ -10,15 +10,11 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLink2_4; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType; @@ -41,7 +37,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlTenantTableDiscriminator extends AbstractJpaEObject implements XmlTenantTableDiscriminator_2_4 +public class XmlTenantTableDiscriminator extends EBaseObjectImpl implements XmlTenantTableDiscriminator_2_4 { /** * The default value of the '{@link #getContextProperty() <em>Context Property</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java index ea0c735488..c3cacc62bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -47,10 +47,10 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay() * @model kind="class" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public class XmlTimeOfDay extends AbstractJpaEObject implements JpaEObject +public class XmlTimeOfDay extends EBaseObjectImpl implements EBaseObject { /** * The default value of the '{@link #getHour() <em>Hour</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java index 67b5c220b6..a6849ef0de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlUnionPartitioning extends AbstractJpaEObject implements XmlUnionPartitioning_2_2 +public class XmlUnionPartitioning extends EBaseObjectImpl implements XmlUnionPartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java index 9cd432c2e9..e42a40df86 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java @@ -10,18 +10,14 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.resource.orm.JPA; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -41,7 +37,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlUuidGenerator extends AbstractJpaEObject implements XmlUuidGenerator_2_4 +public class XmlUuidGenerator extends EBaseObjectImpl implements XmlUuidGenerator_2_4 { /** * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java index e1782a71b4..9c94cfe0ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java @@ -10,16 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.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.common.core.internal.utility.translators.SimpleTranslator; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; import org.eclipse.jpt.jpa.core.resource.orm.JPA; -import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -40,7 +36,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator; * @model kind="class" * @generated */ -public class XmlValuePartitioning extends AbstractJpaEObject implements XmlValuePartitioning_2_2 +public class XmlValuePartitioning extends EBaseObjectImpl implements XmlValuePartitioning_2_2 { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java index 42e5d8554d..2936907052 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java @@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; @@ -309,7 +308,6 @@ public class EclipseLinkOrmV1_1Package extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java index 69bdd82004..b51c17d0d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey; /** @@ -28,10 +28,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlEntity_1_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEntity_1_1 extends JpaEObject +public interface XmlEntity_1_1 extends EBaseObject { /** * Returns the value of the '<em><b>Primary Key</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java index 7451f79963..424061e65e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey; /** @@ -28,10 +28,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlMappedSuperclass_1_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlMappedSuperclass_1_1 extends JpaEObject +public interface XmlMappedSuperclass_1_1 extends EBaseObject { /** * Returns the value of the '<em><b>Primary Key</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java index 8388ed1714..23c33b4f92 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1; import org.eclipse.emf.common.util.EList; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -30,10 +30,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlPrimaryKey_1_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPrimaryKey_1_1 extends JpaEObject +public interface XmlPrimaryKey_1_1 extends EBaseObject { /** * Returns the value of the '<em><b>Validation</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java index a6c55ca98b..aee52d62c8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java @@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package; -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; @@ -792,7 +791,6 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java index 1c09a599ea..37b6a47e1f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCacheInterceptor_2_0 extends JpaEObject +public interface XmlCacheInterceptor_2_0 extends EBaseObject { /** * Returns the value of the '<em><b>Class Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java index 142a7d844f..e19fa71c41 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors; /** @@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEntity_2_0 extends JpaEObject +public interface XmlEntity_2_0 extends EBaseObject { /** * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java index 5e56cca4f4..3b159b788b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0; import org.eclipse.emf.common.util.EList; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -34,10 +34,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlMapKeyAssociationOverrideContainer_2_0 extends JpaEObject +public interface XmlMapKeyAssociationOverrideContainer_2_0 extends EBaseObject { /** * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java index f7c5c71ed6..8e9198e48f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -33,10 +33,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOrderColumn_2_0() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlOrderColumn_2_0 extends JpaEObject +public interface XmlOrderColumn_2_0 extends EBaseObject { /** * Returns the value of the '<em><b>Correction Type</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java index 38fa1162ce..04b3ba09e1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlQueryRedirectors_2_0 extends JpaEObject +public interface XmlQueryRedirectors_2_0 extends EBaseObject { /** * Returns the value of the '<em><b>All Queries</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java index 6dda927b61..e78b22cf6c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.eclipse.emf.common.util.Enumerator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java index fa04a9fa08..6fda69f9a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java @@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; @@ -935,7 +934,6 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java index 86e4709861..4237dbce41 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert; /** @@ -38,10 +38,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlBasic_2_1 extends JpaEObject +public interface XmlBasic_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Return Insert</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java index 24e9b3379c..473c2b3db2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -35,10 +35,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlBatchFetch_2_1 extends JpaEObject +public interface XmlBatchFetch_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Size</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java index 82ccb4cde7..47b38a6cf6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlFetchAttribute_2_1 extends JpaEObject +public interface XmlFetchAttribute_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java index b3e8bf93cb..95c064b15d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup; /** @@ -29,10 +29,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlFetchGroupContainer_2_1 extends JpaEObject +public interface XmlFetchGroupContainer_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java index ce3e4dc0b1..087c94e5bb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute; /** @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlFetchGroup_2_1 extends JpaEObject +public interface XmlFetchGroup_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java index 0127f3b912..bb22ca63d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPrimaryKey_2_1 extends JpaEObject +public interface XmlPrimaryKey_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Cache Key Type</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java index f8fa5eb769..0f9bab794e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlReturnInsert_2_1 extends JpaEObject +public interface XmlReturnInsert_2_1 extends EBaseObject { /** * Returns the value of the '<em><b>Return Only</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java index 74ad68e591..f5bd112b31 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/CacheIsolationType.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.eclipse.emf.common.util.Enumerator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java index e5d5def471..a4f3406524 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java @@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; @@ -2158,7 +2157,6 @@ public class EclipseLinkOrmV2_2Package extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java index 3b131f3abc..de597db897 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlAdditionalCriteria_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlAdditionalCriteria_2_2 extends JpaEObject +public interface XmlAdditionalCriteria_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Criteria</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java index af8f99d010..20feb48696 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicCollection_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlBasicCollection_2_2 extends JpaEObject +public interface XmlBasicCollection_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java index 1fccc92fe3..73a06d367a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicMap_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlBasicMap_2_2 extends JpaEObject +public interface XmlBasicMap_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java index 6eb2e28aca..feace3b390 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasic_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlBasic_2_2 extends JpaEObject +public interface XmlBasic_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Index</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java index a51a7c9920..28d4920f16 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCache_2_2.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCache_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCache_2_2 extends JpaEObject +public interface XmlCache_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Isolation</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java index 87dab02df6..eab08a3c20 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCollectionTable_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCollectionTable_2_2 extends JpaEObject +public interface XmlCollectionTable_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java index cb303b5216..045a1f641e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -40,10 +39,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEntityMappings_2_2 extends JpaEObject +public interface XmlEntityMappings_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Partitioning</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java index b5535220e4..cd47030e39 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlHashPartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlHashPartitioning_2_2 extends JpaEObject +public interface XmlHashPartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java index c0e2b70fc3..a050ed4f88 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java @@ -6,7 +6,7 @@ */ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -22,10 +22,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlId_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlId_2_2 extends JpaEObject +public interface XmlId_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Index</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java index 98d259385b..e5655267cd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -37,10 +37,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlIndex_2_2 extends JpaEObject +public interface XmlIndex_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java index 33db965771..ebbe99588d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlJoinTable_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlJoinTable_2_2 extends JpaEObject +public interface XmlJoinTable_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java index 30dbd3998c..7ea0d3b99d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -39,10 +39,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPartitioningGroup_2_2 extends JpaEObject +public interface XmlPartitioningGroup_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Partitioning</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java index c11826e163..6d19a4c8c8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPartitioning_2_2 extends JpaEObject +public interface XmlPartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java index 4ff0d03d03..c0fccc9307 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPinnedPartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPinnedPartitioning_2_2 extends JpaEObject +public interface XmlPinnedPartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java index 526a939fe6..f49202986f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRangePartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlRangePartitioning_2_2 extends JpaEObject +public interface XmlRangePartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java index 536dd2597c..f370f84296 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlReplicationPartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlReplicationPartitioning_2_2 extends JpaEObject +public interface XmlReplicationPartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java index 7a2bb0f9d5..b05a6c08cc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRoundRobinPartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlRoundRobinPartitioning_2_2 extends JpaEObject +public interface XmlRoundRobinPartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java index 860e82acf4..55c987bdcf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlSecondaryTable_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlSecondaryTable_2_2 extends JpaEObject +public interface XmlSecondaryTable_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java index 6fde551d1d..f46b30bc5c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTableGenerator_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlTableGenerator_2_2 extends JpaEObject +public interface XmlTableGenerator_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java index 4a620143e3..b7dcac9582 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTable_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlTable_2_2 extends JpaEObject +public interface XmlTable_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java index 23926069ff..a691c7e9a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlUnionPartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlUnionPartitioning_2_2 extends JpaEObject +public interface XmlUnionPartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java index 6871869bb0..706f813f40 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlValuePartitioning_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlValuePartitioning_2_2 extends JpaEObject +public interface XmlValuePartitioning_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java index 6b92520779..405c5cd841 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVersion_2_2() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlVersion_2_2 extends JpaEObject +public interface XmlVersion_2_2 extends EBaseObject { /** * Returns the value of the '<em><b>Index</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java index a9cb1f678f..2196e070c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java @@ -13,9 +13,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java index 48ac7bba13..a881ca63c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java @@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; @@ -1042,7 +1041,6 @@ public class EclipseLinkOrmV2_3Package extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java index c963c264f2..cfcf92e38e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.eclipse.emf.common.util.Enumerator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java index 91905162a2..0f09d7526c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -28,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlAttributes_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlAttributes_2_3 extends JpaEObject +public interface XmlAttributes_2_3 extends EBaseObject { /** * Returns the value of the '<em><b>Structures</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java index f098a869f3..1be52a1428 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java @@ -6,7 +6,7 @@ */ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -22,10 +22,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlElementCollection_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlElementCollection_2_3 extends JpaEObject +public interface XmlElementCollection_2_3 extends EBaseObject { /** * Returns the value of the '<em><b>Composite Member</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java index 51e4eb93a9..3e38e7b41a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; - +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable; /** @@ -31,10 +29,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEmbeddable_2_3 extends JpaEObject +public interface XmlEmbeddable_2_3 extends EBaseObject { /** * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java index 9c1ddf28bd..68c1a8694e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable; /** @@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEntityMappings_2_3 extends JpaEObject +public interface XmlEntityMappings_2_3 extends EBaseObject { /** * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java index 907e1e1000..ca297b7065 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMultitenant_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlMultitenant_2_3 extends JpaEObject +public interface XmlMultitenant_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java index 6cd2cf408d..96b6083049 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredFunctionQuery_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlNamedPlsqlStoredFunctionQuery_2_3 extends JpaEObject +public interface XmlNamedPlsqlStoredFunctionQuery_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java index f4ffe08590..c32a8622f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredProcedureQuery_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlNamedPlsqlStoredProcedureQuery_2_3 extends JpaEObject +public interface XmlNamedPlsqlStoredProcedureQuery_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java index 6d5b9b62d0..cf016f7a05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredFunctionQuery_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlNamedStoredFunctionQuery_2_3 extends JpaEObject +public interface XmlNamedStoredFunctionQuery_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java index e63726e7f6..a133f3e816 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPersistenceUnitDefaults_2_3 extends JpaEObject +public interface XmlPersistenceUnitDefaults_2_3 extends EBaseObject { /** * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java index 19892e1459..c05aa9b9e6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlRecord_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPlsqlRecord_2_3 extends JpaEObject +public interface XmlPlsqlRecord_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java index 254d000c31..12860f6ce7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlTable_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlPlsqlTable_2_3 extends JpaEObject +public interface XmlPlsqlTable_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java index 9cd71de2f8..30eb4757bd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStruct_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlStruct_2_3 extends JpaEObject +public interface XmlStruct_2_3 extends EBaseObject { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java index 8447e700b9..1399fa4294 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -19,9 +19,9 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStructure_2_3() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlStructure_2_3 extends JpaEObject +public interface XmlStructure_2_3 extends EBaseObject { } // XmlStructure_2_3 diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java index 2a588af4a0..a59c903805 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.eclipse.emf.common.util.Enumerator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java index d293742434..a6ef71bc7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DatabaseChangeNotificationType.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.eclipse.emf.common.util.Enumerator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java index 97c342d0dc..0d0692a68b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java @@ -13,9 +13,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java index 84fe15f016..72c07a6d03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java @@ -13,26 +13,15 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EEnum; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; - import org.eclipse.emf.ecore.xml.type.XMLTypePackage; - import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; - -import org.eclipse.jpt.jpa.core.resource.xml.CommonPackage; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package; - import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package; /** @@ -1154,7 +1143,6 @@ public class EclipseLinkOrmV2_4Package extends EPackageImpl // Initialize simple dependencies OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java index 704a165765..ec69ebbac1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import java.util.Arrays; import java.util.Collections; import java.util.List; - import org.eclipse.emf.common.util.Enumerator; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java index 86a129458b..f0cd90708f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCacheIndex_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCacheIndex_2_4 extends JpaEObject +public interface XmlCacheIndex_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Column Names</b></em>' attribute list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java index 745c03b914..898398f334 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCache_2_4.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -25,10 +25,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCache_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlCache_2_4 extends JpaEObject +public interface XmlCache_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Database Change Notification Type</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java index a80f849b96..31ea975470 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -26,10 +26,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlElementCollection_2_4 extends JpaEObject +public interface XmlElementCollection_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Field</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java index 52f46f96a8..a3b47b4d49 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbeddable_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEmbeddable_2_4 extends JpaEObject +public interface XmlEmbeddable_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>No Sql</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java index 766c11e42f..6013ce4e48 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbedded_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEmbedded_2_4 extends JpaEObject +public interface XmlEmbedded_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Field</b></em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java index 43f0ed2425..9c16a12166 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntityMappings_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlEntityMappings_2_4 extends JpaEObject +public interface XmlEntityMappings_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Uuid Generators</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java index 2b1bf3ec73..62a25fe915 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -31,10 +31,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlField_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlField_2_4 extends JpaEObject +public interface XmlField_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java index 20aab2a4a6..3cbff96f89 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlJoinField_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlJoinField_2_4 extends JpaEObject +public interface XmlJoinField_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java index 8eee22ccda..ef14af273f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToMany_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlManyToMany_2_4 extends JpaEObject +public interface XmlManyToMany_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java index 8cdc7e6342..0a9a5a5332 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToOne_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlManyToOne_2_4 extends JpaEObject +public interface XmlManyToOne_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java index 81609e2c33..d75c4eb93f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java @@ -9,8 +9,8 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlMultitenant_2_4 extends JpaEObject +public interface XmlMultitenant_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Include Criteria</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java index 9e4134afa3..05c8cb79ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlNoSql_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlNoSql_2_4 extends JpaEObject +public interface XmlNoSql_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Data Type</b></em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java index 98f3c64c13..190b9ddcd0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -27,10 +27,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlOneToMany_2_4 extends JpaEObject +public interface XmlOneToMany_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java index a494caf623..dc2a7d91e8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java @@ -10,8 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; import org.eclipse.emf.common.util.EList; - -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -33,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToOne_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlOneToOne_2_4 extends JpaEObject +public interface XmlOneToOne_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Join Fields</b></em>' containment reference list. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java index 0612c99807..864672709e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; +import org.eclipse.jpt.common.core.resource.xml.EBaseObject; /** * <!-- begin-user-doc --> @@ -32,10 +32,10 @@ import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlTenantTableDiscriminator_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject + * @extends EBaseObject * @generated */ -public interface XmlTenantTableDiscriminator_2_4 extends JpaEObject +public interface XmlTenantTableDiscriminator_2_4 extends EBaseObject { /** * Returns the value of the '<em><b>Context Property</b></em>' attribute. |