### Eclipse Workspace Patch 1.0 #P org.eclipse.jpt.jpa.eclipselink.core Index: model/eclipseLinkResourceModels.genmodel =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel,v retrieving revision 1.12 diff -u -r1.12 eclipseLinkResourceModels.genmodel --- model/eclipseLinkResourceModels.genmodel 29 Feb 2012 20:27:20 -0000 1.12 +++ model/eclipseLinkResourceModels.genmodel 24 May 2012 01:28:39 -0000 @@ -150,6 +150,7 @@ + @@ -157,6 +158,7 @@ + @@ -189,6 +191,7 @@ + @@ -251,6 +254,7 @@ + @@ -265,6 +269,7 @@ + @@ -598,7 +603,18 @@ + + + + + + + + + + + @@ -607,24 +623,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: model/eclipselink_orm.ecore =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore,v retrieving revision 1.13 diff -u -r1.13 eclipselink_orm.ecore --- model/eclipselink_orm.ecore 29 Feb 2012 20:27:20 -0000 1.13 +++ model/eclipselink_orm.ecore 24 May 2012 01:28:39 -0000 @@ -104,7 +104,7 @@ containment="true" resolveProxies="false"/> - + - + - + + @@ -138,8 +139,9 @@ + - + + @@ -188,7 +191,7 @@ - + @@ -250,6 +253,7 @@ + @@ -265,6 +269,7 @@ + @@ -760,7 +765,10 @@ - + + @@ -773,34 +781,110 @@ + + + + - + + + + + + + + + + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkGeneratorContainer.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkGeneratorContainer.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkGeneratorContainer.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkGeneratorContainer.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context; + +import org.eclipse.jpt.jpa.core.context.GeneratorContainer; + +/** + * Container for a table generator and/or sequence generator and/or uuid generator. + * Used by entities and ID mappings. + *

+ * NB: The eclipselink-orm.xml entity mappings element can + * hold more than a single uuid generator, so it does not use this + * container. + *

+ * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + */ +public interface EclipseLinkGeneratorContainer + extends GeneratorContainer +{ + + // ********** uuid generator ********** + + String UUID_GENERATOR_PROPERTY = "uuidGenerator"; //$NON-NLS-1$ + + UuidGenerator getUuidGenerator(); + + UuidGenerator addUuidGenerator(); + + void removeUuidGenerator(); +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/context/UuidGenerator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/context/UuidGenerator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/context/UuidGenerator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/context/UuidGenerator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context; + +import org.eclipse.jpt.jpa.core.context.Generator; + +/** + * uuid generator - corresponds to org.eclipse.persistence.annotations.UuidGenerator + *

+ * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + */ +//TODO extend JpaNamedContextNode instead, UuidGenerator does not support initialValue and allocationSize +public interface UuidGenerator + extends Generator +{ + +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaUuidGenerator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaUuidGenerator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaUuidGenerator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaUuidGenerator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context.java; + +import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.context.UuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkUuidGeneratorAnnotation2_4; + +/** + * EclipseLink 2.4 Java Uuid generator + *

+ * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + */ +public interface JavaUuidGenerator + extends UuidGenerator, JavaJpaContextNode +{ + EclipseLinkUuidGeneratorAnnotation2_4 getGeneratorAnnotation(); +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java,v retrieving revision 1.6 diff -u -r1.6 EclipseLinkEntityMappings.java --- src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java 20 Jan 2012 19:34:34 -0000 1.6 +++ src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java 24 May 2012 01:28:40 -0000 @@ -101,4 +101,15 @@ * Return the number of default tenant discriminator columns. */ int getDefaultTenantDiscriminatorColumnsSize(); + + + ListIterable getUuidGenerators(); + int getUuidGeneratorsSize(); + OrmUuidGenerator addUuidGenerator(); + OrmUuidGenerator addUuidGenerator(int index); + void removeUuidGenerator(int index); + void removeUuidGenerator(OrmUuidGenerator uuidGenerator); + void moveUuidGenerator(int targetIndex, int sourceIndex); + String UUID_GENERATORS_LIST = "uuidGenerators"; //$NON-NLS-1$ + } Index: src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmUuidGenerator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmUuidGenerator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmUuidGenerator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmUuidGenerator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context.orm; + +import org.eclipse.jpt.jpa.core.context.XmlContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.context.UuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; + +/** + * eclipselink-orm.xml 2.4 uuid generator + *

+ * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + */ +public interface OrmUuidGenerator + extends UuidGenerator, XmlContextNode +{ + XmlUuidGenerator_2_4 getXmlGenerator(); + + //********* metadata conversion ********* + + /** + * Build up a mapping file generator from the given Java generator. + */ + void convertFrom(JavaUuidGenerator javaGenerator); +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaAnnotationDefinitionProvider.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaAnnotationDefinitionProvider.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaAnnotationDefinitionProvider.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaAnnotationDefinitionProvider.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,119 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal; + +import java.util.ArrayList; +import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; +import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider; +import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkArray2_3AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicCollectionAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicMapAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCacheAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkClassExtractor2_1AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverters2_2AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMultitenant2_3AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverters2_2AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverters2_2AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructure2_3AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTenantDiscriminatorColumn2_3AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTenantDiscriminatorColumns2_3AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverters2_2AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkUuidGenerator2_4AnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition; + +/** + * Provides annotations for 2.4 EclipseLink platform + */ +public class EclipseLink2_4JpaAnnotationDefinitionProvider + extends AbstractJpaAnnotationDefinitionProvider +{ + // singleton + private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLink2_4JpaAnnotationDefinitionProvider(); + + /** + * Return the singleton + */ + public static JpaAnnotationDefinitionProvider instance() { + return INSTANCE; + } + + /** + * Enforce singleton usage + */ + private EclipseLink2_4JpaAnnotationDefinitionProvider() { + super(); + } + + @Override + protected void addAnnotationDefinitionsTo(ArrayList definitions) { + CollectionTools.addAll(definitions, ANNOTATION_DEFINITIONS); + } + + protected static final AnnotationDefinition[] ANNOTATION_DEFINITIONS = new AnnotationDefinition[] { + EclipseLinkArray2_3AnnotationDefinition.instance(), + EclipseLinkBasicCollectionAnnotationDefinition.instance(), + EclipseLinkBasicMapAnnotationDefinition.instance(), + EclipseLinkCacheAnnotationDefinition.instance(), + EclipseLinkChangeTrackingAnnotationDefinition.instance(), + EclipseLinkClassExtractor2_1AnnotationDefinition.instance(), + EclipseLinkConvertAnnotationDefinition.instance(), + EclipseLinkConverters2_2AnnotationDefinition.instance(), + EclipseLinkCustomizerAnnotationDefinition.instance(), + EclipseLinkExistenceCheckingAnnotationDefinition.instance(), + EclipseLinkJoinFetchAnnotationDefinition.instance(), + EclipseLinkMultitenant2_3AnnotationDefinition.instance(), + EclipseLinkMutableAnnotationDefinition.instance(), + EclipseLinkObjectTypeConverters2_2AnnotationDefinition.instance(), + EclipseLinkPrimaryKeyAnnotationDefinition.instance(), + EclipseLinkPrivateOwnedAnnotationDefinition.instance(), + EclipseLinkReadOnlyAnnotationDefinition.instance(), + EclipseLinkReadTransformerAnnotationDefinition.instance(), + EclipseLinkStructConverters2_2AnnotationDefinition.instance(), + EclipseLinkStructure2_3AnnotationDefinition.instance(), + EclipseLinkTenantDiscriminatorColumns2_3AnnotationDefinition.instance(), + EclipseLinkTransformationAnnotationDefinition.instance(), + EclipseLinkTypeConverters2_2AnnotationDefinition.instance(), + EclipseLinkUuidGenerator2_4AnnotationDefinition.instance(), + EclipseLinkVariableOneToOneAnnotationDefinition.instance(), + EclipseLinkWriteTransformerAnnotationDefinition.instance() + }; + + @Override + protected void addNestableAnnotationDefinitionsTo(ArrayList definitions) { + CollectionTools.addAll(definitions, NESTABLE_ANNOTATION_DEFINITIONS); + } + + protected static final NestableAnnotationDefinition[] NESTABLE_ANNOTATION_DEFINITIONS = new NestableAnnotationDefinition[] { + EclipseLinkConverterAnnotationDefinition.instance(), + EclipseLinkObjectTypeConverterAnnotationDefinition.instance(), + EclipseLinkStructConverterAnnotationDefinition.instance(), + EclipseLinkTenantDiscriminatorColumn2_3AnnotationDefinition.instance(), + EclipseLinkTypeConverterAnnotationDefinition.instance(), + }; +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaFactory.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaFactory.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaFactory.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaFactory.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal; + +import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; +import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer.ParentAdapter; +import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkGeneratorContainer; + +/** + * EclipseLink 2.4 factory + */ +public class EclipseLink2_4JpaFactory + extends EclipseLink2_0JpaFactory +{ + public EclipseLink2_4JpaFactory() { + super(); + } + + @Override + public JavaGeneratorContainer buildJavaGeneratorContainer(ParentAdapter parentAdapter) { + return new JavaEclipseLinkGeneratorContainer(parentAdapter); + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaPlatformFactory.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaPlatformFactory.java,v retrieving revision 1.4 diff -u -r1.4 EclipseLink2_4JpaPlatformFactory.java --- src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaPlatformFactory.java 27 Jan 2012 21:54:31 -0000 1.4 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_4JpaPlatformFactory.java 24 May 2012 01:28:41 -0000 @@ -38,7 +38,7 @@ return new GenericJpaPlatform( id, buildJpaVersion(), - new EclipseLink2_0JpaFactory(), + new EclipseLink2_4JpaFactory(), buildAnnotationProvider(), EclipseLink2_4JpaPlatformProvider.instance(), buildJpaVariation(), @@ -56,7 +56,7 @@ protected AnnotationProvider buildAnnotationProvider() { return new JpaAnnotationProvider( Generic2_0JpaAnnotationDefinitionProvider.instance(), - EclipseLink2_3JpaAnnotationDefinitionProvider.instance()); + EclipseLink2_4JpaAnnotationDefinitionProvider.instance()); } @Override Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,140 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.common.utility.Filter; +import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.jpa.core.context.Generator; +import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaGeneratorContainer; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkGeneratorContainer; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkUuidGeneratorAnnotation2_4; + +public class JavaEclipseLinkGeneratorContainer + extends GenericJavaGeneratorContainer + implements EclipseLinkGeneratorContainer +{ + protected JavaUuidGenerator uuidGenerator; + + + public JavaEclipseLinkGeneratorContainer(ParentAdapter parentAdapter) { + super(parentAdapter); + this.uuidGenerator = this.buildUuidGenerator(); + } + + + // ********** synchronize/update ********** + + @Override + public void synchronizeWithResourceModel() { + super.synchronizeWithResourceModel(); + this.syncUuidGenerator(); + } + + @Override + public void update() { + super.update(); + if (this.uuidGenerator != null) { + this.uuidGenerator.update(); + } + } + + + // ********** Uuid generator ********** + + public JavaUuidGenerator getUuidGenerator() { + return this.uuidGenerator; + } + + public JavaUuidGenerator addUuidGenerator() { + if (this.uuidGenerator != null) { + throw new IllegalStateException("UUID generator already exists: " + this.uuidGenerator); //$NON-NLS-1$ + } + EclipseLinkUuidGeneratorAnnotation2_4 annotation = this.buildUuidGeneratorAnnotation(); + JavaUuidGenerator generator = this.buildUuidGenerator(annotation); + this.setUuidGenerator(generator); + return generator; + } + + protected EclipseLinkUuidGeneratorAnnotation2_4 buildUuidGeneratorAnnotation() { + return (EclipseLinkUuidGeneratorAnnotation2_4) this.parentAdapter.getResourceAnnotatedElement().addAnnotation(EclipseLinkUuidGeneratorAnnotation2_4.ANNOTATION_NAME); + } + + public void removeUuidGenerator() { + if (this.uuidGenerator == null) { + throw new IllegalStateException("Uuid generator does not exist"); //$NON-NLS-1$ + } + this.parentAdapter.getResourceAnnotatedElement().removeAnnotation(EclipseLinkUuidGeneratorAnnotation2_4.ANNOTATION_NAME); + this.setUuidGenerator(null); + } + + protected JavaUuidGenerator buildUuidGenerator() { + EclipseLinkUuidGeneratorAnnotation2_4 annotation = this.getUuidGeneratorAnnotation(); + return (annotation == null) ? null : this.buildUuidGenerator(annotation); + } + + protected EclipseLinkUuidGeneratorAnnotation2_4 getUuidGeneratorAnnotation() { + return (EclipseLinkUuidGeneratorAnnotation2_4) this.parentAdapter.getResourceAnnotatedElement().getAnnotation(EclipseLinkUuidGeneratorAnnotation2_4.ANNOTATION_NAME); + } + + protected JavaUuidGenerator buildUuidGenerator(EclipseLinkUuidGeneratorAnnotation2_4 uuidGeneratorAnnotation) { + return this.parentAdapter.parentSupportsGenerators() ? + new JavaEclipseLinkUuidGenerator(this, uuidGeneratorAnnotation) : + null; + } + + protected void syncUuidGenerator() { + EclipseLinkUuidGeneratorAnnotation2_4 annotation = this.getUuidGeneratorAnnotation(); + if (annotation == null) { + if (this.uuidGenerator != null) { + this.setUuidGenerator(null); + } + } else { + if ((this.uuidGenerator != null) && (this.uuidGenerator.getGeneratorAnnotation() == annotation)) { + this.uuidGenerator.synchronizeWithResourceModel(); + } else { + this.setUuidGenerator(this.buildUuidGenerator(annotation)); + } + } + } + + protected void setUuidGenerator(JavaUuidGenerator uuidGenerator) { + JavaUuidGenerator old = this.uuidGenerator; + this.uuidGenerator = uuidGenerator; + this.firePropertyChanged(UUID_GENERATOR_PROPERTY, old, uuidGenerator); + } + + + // ********** code completion ********** + + @Override + public Iterable getJavaCompletionProposals(int pos, Filter filter, CompilationUnit astRoot) { + Iterable result = super.getJavaCompletionProposals(pos, filter, astRoot); + if (result != null) { + return result; + } + if (this.uuidGenerator != null) { + result = this.uuidGenerator.getJavaCompletionProposals(pos, filter, astRoot); + if (result != null) { + return result; + } + } + return null; + } + + + // ********** misc ********** + + @Override + protected Iterable getGenerators_() { + return new ArrayIterable(this.sequenceGenerator, this.tableGenerator, this.uuidGenerator); + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkUuidGenerator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkUuidGenerator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkUuidGenerator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkUuidGenerator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; + +import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; +import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; +import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.UuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkUuidGeneratorAnnotation2_4; + +/** + * Java UUID generator + */ +public class JavaEclipseLinkUuidGenerator + extends AbstractJavaGenerator + implements JavaUuidGenerator +{ + + + public JavaEclipseLinkUuidGenerator(JavaGeneratorContainer parent, EclipseLinkUuidGeneratorAnnotation2_4 generatorAnnotation) { + super(parent, generatorAnnotation); + } + + + // ********** initial value ********** + + @Override + protected int buildDefaultInitialValue() { + return 0; + } + + + // ********** misc ********** + + public Class getType() { + return UuidGenerator.class; + } + + @Override + public JavaEclipseLinkGeneratorContainer getParent() { + return (JavaEclipseLinkGeneratorContainer) super.getParent(); + } + + // ********** metadata conversion ********** + + public void convertTo(EntityMappings entityMappings) { + ((EclipseLinkEntityMappings) entityMappings).addUuidGenerator().convertFrom(this); + } + + public void delete() { + this.getParent().removeUuidGenerator(); + } + + @Override + protected String getSchema() { + throw new UnsupportedOperationException(); + } + + @Override + protected String getCatalog() { + throw new UnsupportedOperationException(); + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java,v retrieving revision 1.9 diff -u -r1.9 EclipseLinkEntityMappingsImpl.java --- src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java 2 Feb 2012 16:33:53 -0000 1.9 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java 24 May 2012 01:28:42 -0000 @@ -22,6 +22,7 @@ import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.DiscriminatorType; +import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; @@ -38,13 +39,16 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmTenantDiscriminatorColumn2_3; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmUuidGenerator; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmVirtualTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator; 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.XmlUuidGenerator_2_4; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -69,6 +73,7 @@ protected String specifiedSetMethod; protected String defaultSetMethod; + protected final ContextListContainer uuidGeneratorContainer; public EclipseLinkEntityMappingsImpl(OrmXml parent, XmlEntityMappings resource) { super(parent, resource); @@ -78,6 +83,7 @@ this.defaultTenantDiscriminatorColumnContainer = this.buildDefaultTenantDiscriminatorColumnContainer(); this.specifiedGetMethod = this.buildSpecifiedGetMethod(); this.specifiedSetMethod = this.buildSpecifiedSetMethod(); + this.uuidGeneratorContainer = this.buildUuidGeneratorContainer(); } @@ -90,6 +96,7 @@ this.syncSpecifiedTenantDiscriminatorColumns(); this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod()); this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod()); + this.syncUuidGenerators(); } @Override @@ -100,6 +107,7 @@ this.updateDefaultTenantDiscriminatorColumns(); this.setDefaultGetMethod(this.buildDefaultGetMethod()); this.setDefaultSetMethod(this.buildDefaultSetMethod()); + this.updateNodes(this.getUuidGenerators()); } @Override @@ -547,6 +555,97 @@ } + // ********** uuid generators ********** + + public ListIterable getUuidGenerators() { + return this.uuidGeneratorContainer.getContextElements(); + } + + public int getUuidGeneratorsSize() { + return this.uuidGeneratorContainer.getContextElementsSize(); + } + + public OrmUuidGenerator addUuidGenerator() { + return this.addUuidGenerator(this.getUuidGeneratorsSize()); + } + + public OrmUuidGenerator addUuidGenerator(int index) { + XmlUuidGenerator xmlGenerator = this.buildXmlUuidGenerator(); + OrmUuidGenerator uuidGenerator = this.uuidGeneratorContainer.addContextElement(index, xmlGenerator); + this.getXmlEntityMappings().getUuidGenerators().add(index, xmlGenerator); + return uuidGenerator; + } + + protected XmlUuidGenerator buildXmlUuidGenerator() { + return EclipseLinkOrmFactory.eINSTANCE.createXmlUuidGenerator(); + } + + protected OrmUuidGenerator buildUuidGenerator(XmlUuidGenerator_2_4 xmlUuidGenerator) { + return new OrmEclipseLinkUuidGenerator(this, xmlUuidGenerator); + } + + public void removeUuidGenerator(OrmUuidGenerator uuidGenerator) { + this.removeUuidGenerator(this.uuidGeneratorContainer.indexOfContextElement(uuidGenerator)); + } + + public void removeUuidGenerator(int index) { + this.uuidGeneratorContainer.removeContextElement(index); + this.getXmlEntityMappings().getUuidGenerators().remove(index); + } + + public void moveUuidGenerator(int targetIndex, int sourceIndex) { + this.sequenceGeneratorContainer.moveContextElement(targetIndex, sourceIndex); + this.xmlEntityMappings.getSequenceGenerators().move(targetIndex, sourceIndex); + } + + protected void syncUuidGenerators() { + this.uuidGeneratorContainer.synchronizeWithResourceModel(); + } + + protected ListIterable getXmlUuidGenerators() { + // clone to reduce chance of concurrency problems + return new LiveCloneListIterable(this.getXmlEntityMappings().getUuidGenerators()); + } + + protected ContextListContainer buildUuidGeneratorContainer() { + UuidGeneratorContainer container = new UuidGeneratorContainer(); + container.initialize(); + return container; + } + + /** + * sequence generator container + */ + protected class UuidGeneratorContainer + extends ContextListContainer + { + @Override + protected String getContextElementsPropertyName() { + return UUID_GENERATORS_LIST; + } + @Override + protected OrmUuidGenerator buildContextElement(XmlUuidGenerator_2_4 resourceElement) { + return EclipseLinkEntityMappingsImpl.this.buildUuidGenerator(resourceElement); + } + @Override + protected ListIterable getResourceElements() { + return EclipseLinkEntityMappingsImpl.this.getXmlUuidGenerators(); + } + @Override + protected XmlUuidGenerator_2_4 getResourceElement(OrmUuidGenerator contextElement) { + return contextElement.getXmlGenerator(); + } + } + + @Override + @SuppressWarnings("unchecked") + public Iterable getMappingFileGenerators() { + return new CompositeIterable( + super.getMappingFileGenerators(), + this.getUuidGenerators() + ); + } + // ********** misc ********** @Override Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4ContextNodeFactory.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4ContextNodeFactory.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4ContextNodeFactory.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4ContextNodeFactory.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; + +import org.eclipse.jpt.jpa.core.context.XmlContextNode; +import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratorContainer; +import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4; + +public class EclipseLinkOrmXml2_4ContextNodeFactory + extends EclipseLinkOrmXml2_3ContextNodeFactory +{ + + @Override + public OrmGeneratorContainer buildOrmGeneratorContainer(XmlContextNode parent, XmlGeneratorContainer resourceGeneratorContainer) { + return new OrmEclipseLinkGeneratorContainer(parent, (XmlGeneratorContainer2_4) resourceGeneratorContainer); + } + +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4Definition.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4Definition.java,v retrieving revision 1.2 diff -u -r1.2 EclipseLinkOrmXml2_4Definition.java --- src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4Definition.java 15 Dec 2011 19:37:43 -0000 1.2 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXml2_4Definition.java 24 May 2012 01:28:43 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -47,7 +47,7 @@ @Override protected OrmXmlContextNodeFactory buildContextNodeFactory() { - return EclipseLinkOrmXml2_3Definition.instance().getContextNodeFactory(); + return new EclipseLinkOrmXml2_4ContextNodeFactory(); } @Override Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,145 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; + +import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.jpa.core.context.Generator; +import org.eclipse.jpt.jpa.core.context.XmlContextNode; +import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmGeneratorContainer; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkGeneratorContainer; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; + +public class OrmEclipseLinkGeneratorContainer + extends GenericOrmGeneratorContainer + implements EclipseLinkGeneratorContainer +{ + + protected OrmUuidGenerator uuidGenerator; + + + public OrmEclipseLinkGeneratorContainer(XmlContextNode parent, XmlGeneratorContainer2_4 xmlGeneratorContainer) { + super(parent, xmlGeneratorContainer); + this.uuidGenerator = this.buildUuidGenerator(); + } + + protected XmlGeneratorContainer2_4 getXmlGeneratorContainer() { + return (XmlGeneratorContainer2_4) this.xmlGeneratorContainer; + } + + + // ********** synchronize/update ********** + + @Override + public void synchronizeWithResourceModel() { + super.synchronizeWithResourceModel(); + this.syncUuidGenerator(); + } + + @Override + public void update() { + super.update(); + if (this.uuidGenerator != null) { + this.uuidGenerator.update(); + } + } + + + // ********** uuid generator ********** + + public OrmUuidGenerator getUuidGenerator() { + return this.uuidGenerator; + } + + public OrmUuidGenerator addUuidGenerator() { + if (this.uuidGenerator != null) { + throw new IllegalStateException("uuid generator already exists: " + this.uuidGenerator); //$NON-NLS-1$ + } + XmlUuidGenerator xmlGenerator = this.buildXmlUuidGenerator(); + OrmUuidGenerator generator = this.buildUuidGenerator(xmlGenerator); + this.setUuidGenerator_(generator); + this.getXmlGeneratorContainer().setUuidGenerator(xmlGenerator); + return generator; + } + + protected XmlUuidGenerator buildXmlUuidGenerator() { + return EclipseLinkOrmFactory.eINSTANCE.createXmlUuidGenerator(); + } + + public void removeUuidGenerator() { + if (this.uuidGenerator == null) { + throw new IllegalStateException("uuid generator does not exist"); //$NON-NLS-1$ + } + this.setUuidGenerator_(null); + this.getXmlGeneratorContainer().setUuidGenerator(null); + } + + protected OrmUuidGenerator buildUuidGenerator() { + XmlUuidGenerator_2_4 xmlGenerator = this.getXmlUuidGenerator(); + return (xmlGenerator == null) ? null : this.buildUuidGenerator(xmlGenerator); + } + + protected XmlUuidGenerator_2_4 getXmlUuidGenerator() { + return this.getXmlGeneratorContainer().getUuidGenerator(); + } + + protected OrmUuidGenerator buildUuidGenerator(XmlUuidGenerator_2_4 xmlUuidGenerator) { + return new OrmEclipseLinkUuidGenerator(this, xmlUuidGenerator); + } + + protected void syncUuidGenerator() { + XmlUuidGenerator_2_4 xmlGenerator = this.getXmlUuidGenerator(); + if (xmlGenerator == null) { + if (this.uuidGenerator != null) { + this.setUuidGenerator_(null); + } + } else { + if ((this.uuidGenerator != null) && (this.uuidGenerator.getXmlGenerator() == xmlGenerator)) { + this.uuidGenerator.synchronizeWithResourceModel(); + } else { + this.setUuidGenerator_(this.buildUuidGenerator(xmlGenerator)); + } + } + } + + protected void setUuidGenerator_(OrmUuidGenerator uuidGenerator) { + OrmUuidGenerator old = this.uuidGenerator; + this.uuidGenerator = uuidGenerator; + this.firePropertyChanged(UUID_GENERATOR_PROPERTY, old, uuidGenerator); + } + + + // ********** completion proposals ********** + + @Override + public Iterable getXmlCompletionProposals(int pos) { + Iterable result = super.getXmlCompletionProposals(pos); + if (result != null) { + return result; + } + if (this.uuidGenerator != null) { + result = this.uuidGenerator.getXmlCompletionProposals(pos); + if (result != null) { + return result; + } + } + return null; + } + + // ********** misc ********** + + @Override + protected Iterable getGenerators_() { + return new ArrayIterable(this.sequenceGenerator, this.tableGenerator, this.uuidGenerator); + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkUuidGenerator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkUuidGenerator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkUuidGenerator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkUuidGenerator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; + +import org.eclipse.jpt.jpa.core.context.XmlContextNode; +import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.UuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmUuidGenerator; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; + +/** + * eclipselink-orm.xml uuid generator + */ +public class OrmEclipseLinkUuidGenerator + extends AbstractOrmGenerator + implements OrmUuidGenerator +{ + + + public OrmEclipseLinkUuidGenerator(XmlContextNode parent, XmlUuidGenerator_2_4 xmlSequenceGenerator) { + super(parent, xmlSequenceGenerator); + } + + // ********** metadata conversion ********** + + public void convertFrom(JavaUuidGenerator javaGenerator) { + this.setName(javaGenerator.getName()); + } + + // ********** misc ********** + + public Class getType() { + return UuidGenerator.class; + } + + //TODO remove these methods after refactoring UuidGenerator to extend JpaNamedContextNode + @Override + protected int buildDefaultInitialValue() { + return 0; + } + @Override + protected String getSchema() { + return null; + } + @Override + protected String getCatalog() { + return null; + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkUuidGenerator2_4AnnotationDefinition.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkUuidGenerator2_4AnnotationDefinition.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkUuidGenerator2_4AnnotationDefinition.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkUuidGenerator2_4AnnotationDefinition.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java; + +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jpt.common.core.resource.java.Annotation; +import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; +import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkUuidGeneratorAnnotation2_4; +import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkUuidGeneratorAnnotation2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkUuidGeneratorAnnotation2_4; + +public class EclipseLinkUuidGenerator2_4AnnotationDefinition + implements AnnotationDefinition +{ + // singleton + private static final AnnotationDefinition INSTANCE = new EclipseLinkUuidGenerator2_4AnnotationDefinition(); + + /** + * Return the singleton. + */ + public static AnnotationDefinition instance() { + return INSTANCE; + } + + /** + * Ensure single instance. + */ + protected EclipseLinkUuidGenerator2_4AnnotationDefinition() { + super(); + } + + public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) { + return new SourceEclipseLinkUuidGeneratorAnnotation2_4(parent, annotatedElement); + } + + public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) { + throw new UnsupportedOperationException(); + } + + public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) { + return new BinaryEclipseLinkUuidGeneratorAnnotation2_4(parent, jdtAnnotation); + } + + public String getAnnotationName() { + return EclipseLinkUuidGeneratorAnnotation2_4.ANNOTATION_NAME; + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkUuidGeneratorAnnotation2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkUuidGeneratorAnnotation2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkUuidGeneratorAnnotation2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkUuidGeneratorAnnotation2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,90 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary; + +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; +import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkUuidGeneratorAnnotation2_4; + +/** + * org.eclipse.persistence.annotations.Multitenant + */ +public class BinaryEclipseLinkUuidGeneratorAnnotation2_4 + extends BinaryAnnotation + implements EclipseLinkUuidGeneratorAnnotation2_4 +{ + private String name; + + + public BinaryEclipseLinkUuidGeneratorAnnotation2_4(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) { + super(parent, jdtAnnotation); + this.name = this.buildName(); + } + + public String getAnnotationName() { + return ANNOTATION_NAME; + } + + @Override + public void update() { + super.update(); + this.setName_(this.buildName()); + } + + + // ********** EclipseLinkMultitenantAnnotation implementation ********** + + // ***** name + public String getName() { + return this.name; + } + + public void setName(String name) { + throw new UnsupportedOperationException(); + } + + private void setName_(String name) { + String old = this.name; + this.name = name; + this.firePropertyChanged(NAME_PROPERTY, old, name); + } + + private String buildName() { + return (String) this.getJdtMemberValue(EclipseLink.UUID_GENERATOR__NAME); + } + + public TextRange getNameTextRange() { + throw new UnsupportedOperationException(); + } + + + public Integer getInitialValue() { + return null; + } + public void setInitialValue(Integer initialValue) { + throw new UnsupportedOperationException(); + } + public TextRange getInitialValueTextRange() { + throw new UnsupportedOperationException(); + } + public Integer getAllocationSize() { + return null; + } + public void setAllocationSize(Integer allocationSize) { + throw new UnsupportedOperationException(); + } + public TextRange getAllocationSizeTextRange() { + throw new UnsupportedOperationException(); + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkUuidGeneratorAnnotation2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkUuidGeneratorAnnotation2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkUuidGeneratorAnnotation2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkUuidGeneratorAnnotation2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,136 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation; +import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter; +import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter; +import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; +import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; +import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter; +import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; +import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; +import org.eclipse.jpt.jpa.core.resource.java.JPA; +import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkUuidGeneratorAnnotation2_4; + +/** + * org.eclipse.persistence.annotations.UuidGenerator + */ +public class SourceEclipseLinkUuidGeneratorAnnotation2_4 + extends SourceAnnotation + implements EclipseLinkUuidGeneratorAnnotation2_4 +{ + private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER + = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); + + private static final DeclarationAnnotationElementAdapter NAME_ADAPTER = buildAdapter(JPA.SEQUENCE_GENERATOR__NAME); + final AnnotationElementAdapter nameAdapter; + String name; + TextRange nameTextRange; + + public SourceEclipseLinkUuidGeneratorAnnotation2_4(JavaResourceAnnotatedElement parent, AnnotatedElement element) { + super(parent, element, DECLARATION_ANNOTATION_ADAPTER); + this.nameAdapter = this.buildAdapter(NAME_ADAPTER); + } + + protected AnnotationElementAdapter buildAdapter(DeclarationAnnotationElementAdapter daea) { + return new AnnotatedElementAnnotationElementAdapter(this.annotatedElement, daea); + } + + public String getAnnotationName() { + return ANNOTATION_NAME; + } + + public void initialize(CompilationUnit astRoot) { + this.name = this.buildName(astRoot); + this.nameTextRange = this.buildNameTextRange(astRoot); + } + + public void synchronizeWith(CompilationUnit astRoot) { + this.syncName(this.buildName(astRoot)); + this.nameTextRange = this.buildNameTextRange(astRoot); + } + + @Override + public boolean isUnset() { + return super.isUnset() && + (this.name == null); + } + + @Override + public void toString(StringBuilder sb) { + sb.append(this.name); + } + + // ***** name + public String getName() { + return this.name; + } + + public void setName(String name) { + if (this.attributeValueHasChanged(this.name, name)) { + this.name = name; + this.nameAdapter.setValue(name); + } + } + + private void syncName(String astName) { + String old = this.name; + this.name = astName; + this.firePropertyChanged(NAME_PROPERTY, old, astName); + } + + private String buildName(CompilationUnit astRoot) { + return this.nameAdapter.getValue(astRoot); + } + + public TextRange getNameTextRange() { + return this.nameTextRange; + } + + private TextRange buildNameTextRange(CompilationUnit astRoot) { + return this.getElementTextRange(NAME_ADAPTER, astRoot); + } + + + // ********** static methods ********** + + protected static DeclarationAnnotationElementAdapter buildAdapter(String elementName) { + return buildAdapter(DECLARATION_ANNOTATION_ADAPTER, elementName); + } + + static DeclarationAnnotationElementAdapter buildAdapter(DeclarationAnnotationAdapter annotationAdapter, String elementName) { + return ConversionDeclarationAnnotationElementAdapter.forStrings(annotationAdapter, elementName); + } + + + public Integer getInitialValue() { + return null; + } + public void setInitialValue(Integer initialValue) { + throw new UnsupportedOperationException(); + } + public TextRange getInitialValueTextRange() { + throw new UnsupportedOperationException(); + } + public Integer getAllocationSize() { + return null; + } + public void setAllocationSize(Integer allocationSize) { + throw new UnsupportedOperationException(); + } + public TextRange getAllocationSizeTextRange() { + throw new UnsupportedOperationException(); + } +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java,v retrieving revision 1.4 diff -u -r1.4 EclipseLink.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java 15 Dec 2011 19:37:43 -0000 1.4 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java 24 May 2012 01:28:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -193,5 +193,6 @@ // EclispeLink 2.4 annotations String MULTITENANT__INCLUDE_CRITERIA = "includeCriteria"; - + String UUID_GENERATOR = PACKAGE_ + "UuidGenerator"; + String UUID_GENERATOR__NAME = "name"; } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkUuidGeneratorAnnotation2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkUuidGeneratorAnnotation2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkUuidGeneratorAnnotation2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkUuidGeneratorAnnotation2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.java; + +import org.eclipse.jpt.jpa.core.resource.java.GeneratorAnnotation; + +/** + * Corresponds to the EclipseLink annotation + * org.eclipse.persistence.annotations.UuidGenerator + *

+ * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + */ +public interface EclipseLinkUuidGeneratorAnnotation2_4 + extends GeneratorAnnotation //TODO don't extend GeneratorAnnotation +{ + String ANNOTATION_NAME = EclipseLink.UUID_GENERATOR; + +} Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java,v retrieving revision 1.4 diff -u -r1.4 EclipseLinkOrmFactory.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java 2 Sep 2011 20:59:38 -0000 1.4 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java 24 May 2012 01:28:45 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. + * Copyright (c) 2008, 2012 Oracle. * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at @@ -106,10 +106,12 @@ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings(); case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE: return (EObject)createXmlFetchAttribute(); case EclipseLinkOrmPackage.XML_FETCH_GROUP: return (EObject)createXmlFetchGroup(); + case EclipseLinkOrmPackage.XML_FIELD: return (EObject)createXmlField(); case EclipseLinkOrmPackage.XML_HASH_PARTITIONING: return (EObject)createXmlHashPartitioning(); case EclipseLinkOrmPackage.XML_ID: return (EObject)createXmlId(); case EclipseLinkOrmPackage.XML_INDEX: return (EObject)createXmlIndex(); case EclipseLinkOrmPackage.XML_INSTANTIATION_COPY_POLICY: return (EObject)createXmlInstantiationCopyPolicy(); + case EclipseLinkOrmPackage.XML_JOIN_FIELD: return (EObject)createXmlJoinField(); case EclipseLinkOrmPackage.XML_JOIN_TABLE: return (EObject)createXmlJoinTable(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY: return (EObject)createXmlManyToMany(); case EclipseLinkOrmPackage.XML_MANY_TO_ONE: return (EObject)createXmlManyToOne(); @@ -120,6 +122,7 @@ case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY: return (EObject)createXmlNamedPlsqlStoredProcedureQuery(); case EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY: return (EObject)createXmlNamedStoredFunctionQuery(); case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY: return (EObject)createXmlNamedStoredProcedureQuery(); + case EclipseLinkOrmPackage.XML_NO_SQL: return (EObject)createXmlNoSql(); case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER: return (EObject)createXmlObjectTypeConverter(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY: return (EObject)createXmlOneToMany(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE: return (EObject)createXmlOneToOne(); @@ -146,11 +149,13 @@ case EclipseLinkOrmPackage.XML_TABLE: return (EObject)createXmlTable(); case EclipseLinkOrmPackage.XML_TABLE_GENERATOR: return (EObject)createXmlTableGenerator(); case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN: return (EObject)createXmlTenantDiscriminatorColumn(); + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR: return (EObject)createXmlTenantTableDiscriminator(); case EclipseLinkOrmPackage.XML_TIME_OF_DAY: return (EObject)createXmlTimeOfDay(); case EclipseLinkOrmPackage.XML_TRANSFORMATION: return (EObject)createXmlTransformation(); case EclipseLinkOrmPackage.XML_TRANSIENT: return (EObject)createXmlTransient(); case EclipseLinkOrmPackage.XML_TYPE_CONVERTER: return (EObject)createXmlTypeConverter(); case EclipseLinkOrmPackage.XML_UNION_PARTITIONING: return (EObject)createXmlUnionPartitioning(); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR: return (EObject)createXmlUuidGenerator(); case EclipseLinkOrmPackage.XML_VALUE_PARTITIONING: return (EObject)createXmlValuePartitioning(); case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE: return (EObject)createXmlVariableOneToOne(); case EclipseLinkOrmPackage.XML_VERSION: return (EObject)createXmlVersion(); @@ -497,6 +502,17 @@ * * @generated */ + public XmlField createXmlField() + { + XmlField xmlField = new XmlField(); + return xmlField; + } + + /** + * + * + * @generated + */ public XmlId createXmlId() { XmlId xmlId = new XmlId(); @@ -530,6 +546,17 @@ * * @generated */ + public XmlJoinField createXmlJoinField() + { + XmlJoinField xmlJoinField = new XmlJoinField(); + return xmlJoinField; + } + + /** + * + * + * @generated + */ public XmlJoinTable createXmlJoinTable() { XmlJoinTable xmlJoinTable = new XmlJoinTable(); @@ -640,6 +667,17 @@ * * @generated */ + public XmlNoSql createXmlNoSql() + { + XmlNoSql xmlNoSql = new XmlNoSql(); + return xmlNoSql; + } + + /** + * + * + * @generated + */ public XmlObjectTypeConverter createXmlObjectTypeConverter() { XmlObjectTypeConverter xmlObjectTypeConverter = new XmlObjectTypeConverter(); @@ -849,6 +887,17 @@ * * @generated */ + public XmlTenantTableDiscriminator createXmlTenantTableDiscriminator() + { + XmlTenantTableDiscriminator xmlTenantTableDiscriminator = new XmlTenantTableDiscriminator(); + return xmlTenantTableDiscriminator; + } + + /** + * + * + * @generated + */ public XmlTimeOfDay createXmlTimeOfDay() { XmlTimeOfDay xmlTimeOfDay = new XmlTimeOfDay(); @@ -1014,6 +1063,17 @@ * * @generated */ + public XmlUuidGenerator createXmlUuidGenerator() + { + XmlUuidGenerator xmlUuidGenerator = new XmlUuidGenerator(); + return xmlUuidGenerator; + } + + /** + * + * + * @generated + */ public XmlValuePartitioning createXmlValuePartitioning() { XmlValuePartitioning xmlValuePartitioning = new XmlValuePartitioning(); Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java,v retrieving revision 1.13 diff -u -r1.13 EclipseLinkOrmPackage.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java 29 Feb 2012 20:27:20 -0000 1.13 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java 24 May 2012 01:28:49 -0000 @@ -640,13 +640,29 @@ */ public static final int XML_BASIC__INDEX = OrmPackage.XML_BASIC_FEATURE_COUNT + 5; /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_BASIC__UUID_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 6; + /** + * The feature id for the 'Field' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_BASIC__FIELD = OrmPackage.XML_BASIC_FEATURE_COUNT + 7; + /** * The feature id for the 'Cache Index' containment reference. * * * @generated * @ordered */ - public static final int XML_BASIC__CACHE_INDEX = OrmPackage.XML_BASIC_FEATURE_COUNT + 6; + public static final int XML_BASIC__CACHE_INDEX = OrmPackage.XML_BASIC_FEATURE_COUNT + 8; /** * The feature id for the 'Access Methods' containment reference. * @@ -654,7 +670,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__ACCESS_METHODS = OrmPackage.XML_BASIC_FEATURE_COUNT + 7; + public static final int XML_BASIC__ACCESS_METHODS = OrmPackage.XML_BASIC_FEATURE_COUNT + 9; /** * The feature id for the 'Properties' containment reference list. * @@ -662,7 +678,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__PROPERTIES = OrmPackage.XML_BASIC_FEATURE_COUNT + 8; + public static final int XML_BASIC__PROPERTIES = OrmPackage.XML_BASIC_FEATURE_COUNT + 10; /** * The feature id for the 'Attribute Type' attribute. * @@ -670,7 +686,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__ATTRIBUTE_TYPE = OrmPackage.XML_BASIC_FEATURE_COUNT + 9; + public static final int XML_BASIC__ATTRIBUTE_TYPE = OrmPackage.XML_BASIC_FEATURE_COUNT + 11; /** * The feature id for the 'Mutable' attribute. * @@ -678,7 +694,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 10; + public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 12; /** * The feature id for the 'Convert' attribute. * @@ -686,7 +702,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 11; + public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 13; /** * The feature id for the 'Converters' containment reference list. * @@ -694,7 +710,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 12; + public static final int XML_BASIC__CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 14; /** * The feature id for the 'Type Converters' containment reference list. * @@ -702,7 +718,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__TYPE_CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 13; + public static final int XML_BASIC__TYPE_CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 15; /** * The feature id for the 'Object Type Converters' containment reference list. * @@ -710,7 +726,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 14; + public static final int XML_BASIC__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 16; /** * The feature id for the 'Struct Converters' containment reference list. * @@ -718,7 +734,7 @@ * @generated * @ordered */ - public static final int XML_BASIC__STRUCT_CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 15; + public static final int XML_BASIC__STRUCT_CONVERTERS = OrmPackage.XML_BASIC_FEATURE_COUNT + 17; /** * The number of structural features of the 'Xml Basic' class. * @@ -726,7 +742,7 @@ * @generated * @ordered */ - public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 16; + public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 18; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection Xml Basic Collection}' class. * @@ -1267,7 +1283,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter() * @generated */ - public static final int XML_NAMED_CONVERTER = 45; + public static final int XML_NAMED_CONVERTER = 47; /** * The feature id for the 'Name' attribute. * @@ -1852,13 +1868,21 @@ */ public static final int XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 23; /** + * The feature id for the 'Field' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION__FIELD = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 24; + /** * The feature id for the 'Delete All' attribute. * * * @generated * @ordered */ - public static final int XML_ELEMENT_COLLECTION__DELETE_ALL = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 24; + public static final int XML_ELEMENT_COLLECTION__DELETE_ALL = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 25; /** * The number of structural features of the 'Xml Element Collection' class. * @@ -1866,7 +1890,7 @@ * @generated * @ordered */ - public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 25; + public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 26; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable Xml Embeddable}' class. * @@ -1973,13 +1997,21 @@ */ public static final int XML_EMBEDDABLE__STRUCT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 6; /** + * The feature id for the 'No Sql' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_EMBEDDABLE__NO_SQL = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 7; + /** * The feature id for the 'Customizer' containment reference. * * * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CUSTOMIZER = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 7; + public static final int XML_EMBEDDABLE__CUSTOMIZER = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 8; /** * The feature id for the 'Change Tracking' containment reference. * @@ -1987,7 +2019,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CHANGE_TRACKING = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 8; + public static final int XML_EMBEDDABLE__CHANGE_TRACKING = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 9; /** * The feature id for the 'Converters' containment reference list. * @@ -1995,7 +2027,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 9; + public static final int XML_EMBEDDABLE__CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 10; /** * The feature id for the 'Type Converters' containment reference list. * @@ -2003,7 +2035,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 10; + public static final int XML_EMBEDDABLE__TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 11; /** * The feature id for the 'Object Type Converters' containment reference list. * @@ -2011,7 +2043,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 11; + public static final int XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 12; /** * The feature id for the 'Struct Converters' containment reference list. * @@ -2019,7 +2051,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__STRUCT_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 12; + public static final int XML_EMBEDDABLE__STRUCT_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 13; /** * The feature id for the 'Properties' containment reference list. * @@ -2027,7 +2059,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__PROPERTIES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 13; + public static final int XML_EMBEDDABLE__PROPERTIES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 14; /** * The feature id for the 'Copy Policy' containment reference. * @@ -2035,7 +2067,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 14; + public static final int XML_EMBEDDABLE__COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 15; /** * The feature id for the 'Instantiation Copy Policy' containment reference. * @@ -2043,7 +2075,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 15; + public static final int XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 16; /** * The feature id for the 'Clone Copy Policy' containment reference. * @@ -2051,7 +2083,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__CLONE_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 16; + public static final int XML_EMBEDDABLE__CLONE_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 17; /** * The feature id for the 'Exclude Default Mappings' attribute. * @@ -2059,7 +2091,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 17; + public static final int XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 18; /** * The number of structural features of the 'Xml Embeddable' class. * @@ -2067,7 +2099,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDABLE_FEATURE_COUNT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 18; + public static final int XML_EMBEDDABLE_FEATURE_COUNT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 19; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded Xml Embedded}' class. * @@ -2110,13 +2142,21 @@ */ public static final int XML_EMBEDDED__ASSOCIATION_OVERRIDES = OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES; /** + * The feature id for the 'Field' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_EMBEDDED__FIELD = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 0; + /** * The feature id for the 'Access Methods' containment reference. * * * @generated * @ordered */ - public static final int XML_EMBEDDED__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 0; + public static final int XML_EMBEDDED__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1; /** * The feature id for the 'Properties' containment reference list. * @@ -2124,7 +2164,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDED__PROPERTIES = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1; + public static final int XML_EMBEDDED__PROPERTIES = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 2; /** * The feature id for the 'Attribute Type' attribute. * @@ -2132,7 +2172,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDED__ATTRIBUTE_TYPE = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 2; + public static final int XML_EMBEDDED__ATTRIBUTE_TYPE = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 3; /** * The number of structural features of the 'Xml Embedded' class. * @@ -2140,7 +2180,7 @@ * @generated * @ordered */ - public static final int XML_EMBEDDED_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 3; + public static final int XML_EMBEDDED_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 4; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId Xml Embedded Id}' class. * @@ -2672,13 +2712,29 @@ */ public static final int XML_ENTITY__STRUCT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 25; /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_ENTITY__UUID_GENERATOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 26; + /** * The feature id for the 'Cache Index' containment reference. * * * @generated * @ordered */ - public static final int XML_ENTITY__CACHE_INDEX = OrmPackage.XML_ENTITY_FEATURE_COUNT + 26; + public static final int XML_ENTITY__CACHE_INDEX = OrmPackage.XML_ENTITY_FEATURE_COUNT + 27; + /** + * The feature id for the 'No Sql' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_ENTITY__NO_SQL = OrmPackage.XML_ENTITY_FEATURE_COUNT + 28; /** * The feature id for the 'Read Only' attribute. * @@ -2686,7 +2742,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 27; + public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 29; /** * The feature id for the 'Customizer' containment reference. * @@ -2694,7 +2750,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 28; + public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 30; /** * The feature id for the 'Change Tracking' containment reference. * @@ -2702,7 +2758,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 29; + public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 31; /** * The feature id for the 'Cache' containment reference. * @@ -2710,7 +2766,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 30; + public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 32; /** * The feature id for the 'Existence Checking' attribute. * @@ -2718,7 +2774,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 31; + public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 33; /** * The feature id for the 'Converters' containment reference list. * @@ -2726,7 +2782,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 32; + public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 34; /** * The feature id for the 'Type Converters' containment reference list. * @@ -2734,7 +2790,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 33; + public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 35; /** * The feature id for the 'Object Type Converters' containment reference list. * @@ -2742,7 +2798,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 34; + public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 36; /** * The feature id for the 'Struct Converters' containment reference list. * @@ -2750,7 +2806,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 35; + public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 37; /** * The feature id for the 'Named Stored Procedure Queries' containment reference list. * @@ -2758,7 +2814,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 36; + public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 38; /** * The feature id for the 'Properties' containment reference list. * @@ -2766,7 +2822,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 37; + public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 39; /** * The feature id for the 'Optimistic Locking' containment reference. * @@ -2774,7 +2830,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 38; + public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 40; /** * The feature id for the 'Copy Policy' containment reference. * @@ -2782,7 +2838,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 39; + public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 41; /** * The feature id for the 'Instantiation Copy Policy' containment reference. * @@ -2790,7 +2846,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 40; + public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 42; /** * The feature id for the 'Clone Copy Policy' containment reference. * @@ -2798,7 +2854,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 41; + public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 43; /** * The feature id for the 'Exclude Default Mappings' attribute. * @@ -2806,7 +2862,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 42; + public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 44; /** * The number of structural features of the 'Xml Entity' class. * @@ -2814,7 +2870,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 43; + public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 45; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings Xml Entity Mappings}' class. * @@ -3073,13 +3129,21 @@ */ public static final int XML_ENTITY_MAPPINGS__PLSQL_TABLES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 14; /** + * The feature id for the 'Uuid Generators' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_ENTITY_MAPPINGS__UUID_GENERATORS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 15; + /** * The feature id for the 'Converters' containment reference list. * * * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS__CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 15; + public static final int XML_ENTITY_MAPPINGS__CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 16; /** * The feature id for the 'Type Converters' containment reference list. * @@ -3087,7 +3151,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 16; + public static final int XML_ENTITY_MAPPINGS__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 17; /** * The feature id for the 'Object Type Converters' containment reference list. * @@ -3095,7 +3159,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 17; + public static final int XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 18; /** * The feature id for the 'Struct Converters' containment reference list. * @@ -3103,7 +3167,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 18; + public static final int XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 19; /** * The feature id for the 'Named Stored Procedure Queries' containment reference list. * @@ -3111,7 +3175,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 19; + public static final int XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 20; /** * The number of structural features of the 'Xml Entity Mappings' class. * @@ -3119,7 +3183,7 @@ * @generated * @ordered */ - public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 20; + public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 21; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute Xml Fetch Attribute}' class. * @@ -3187,6 +3251,31 @@ */ public static final int XML_FETCH_GROUP_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21_FEATURE_COUNT + 0; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField Xml Field}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlField() + * @generated + */ + public static final int XML_FIELD = 33; + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_FIELD__NAME = EclipseLinkOrmV2_4Package.XML_FIELD_24__NAME; + /** + * The number of structural features of the 'Xml Field' class. + * + * + * @generated + * @ordered + */ + public static final int XML_FIELD_FEATURE_COUNT = EclipseLinkOrmV2_4Package.XML_FIELD_24_FEATURE_COUNT + 0; + /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId Xml Id}' class. * * @@ -3194,7 +3283,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId() * @generated */ - public static final int XML_ID = 34; + public static final int XML_ID = 35; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex Xml Index}' class. * @@ -3203,7 +3292,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex() * @generated */ - public static final int XML_INDEX = 35; + public static final int XML_INDEX = 36; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy Xml Instantiation Copy Policy}' class. * @@ -3212,7 +3301,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy() * @generated */ - public static final int XML_INSTANTIATION_COPY_POLICY = 36; + public static final int XML_INSTANTIATION_COPY_POLICY = 37; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch Xml Join Fetch}' class. * @@ -3221,7 +3310,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch() * @generated */ - public static final int XML_JOIN_FETCH = 37; + public static final int XML_JOIN_FETCH = 38; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable Xml Join Table}' class. * @@ -3230,7 +3319,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinTable() * @generated */ - public static final int XML_JOIN_TABLE = 38; + public static final int XML_JOIN_TABLE = 40; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany Xml Many To Many}' class. * @@ -3239,7 +3328,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany() * @generated */ - public static final int XML_MANY_TO_MANY = 39; + public static final int XML_MANY_TO_MANY = 41; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne Xml Many To One}' class. * @@ -3248,7 +3337,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne() * @generated */ - public static final int XML_MANY_TO_ONE = 40; + public static final int XML_MANY_TO_ONE = 42; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass Xml Mapped Superclass}' class. * @@ -3257,7 +3346,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass() * @generated */ - public static final int XML_MAPPED_SUPERCLASS = 41; + public static final int XML_MAPPED_SUPERCLASS = 43; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable Xml Mutable}' class. * @@ -3266,7 +3355,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable() * @generated */ - public static final int XML_MUTABLE = 44; + public static final int XML_MUTABLE = 46; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery Xml Named Stored Procedure Query}' class. * @@ -3275,7 +3364,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery() * @generated */ - public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 49; + public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 51; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter Xml Object Type Converter}' class. * @@ -3284,7 +3373,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter() * @generated */ - public static final int XML_OBJECT_TYPE_CONVERTER = 50; + public static final int XML_OBJECT_TYPE_CONVERTER = 53; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany Xml One To Many}' class. * @@ -3293,7 +3382,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany() * @generated */ - public static final int XML_ONE_TO_MANY = 51; + public static final int XML_ONE_TO_MANY = 54; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne Xml One To One}' class. * @@ -3302,7 +3391,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne() * @generated */ - public static final int XML_ONE_TO_ONE = 52; + public static final int XML_ONE_TO_ONE = 55; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking Xml Optimistic Locking}' class. * @@ -3311,7 +3400,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking() * @generated */ - public static final int XML_OPTIMISTIC_LOCKING = 53; + public static final int XML_OPTIMISTIC_LOCKING = 56; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn Xml Order Column}' class. * @@ -3320,7 +3409,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn() * @generated */ - public static final int XML_ORDER_COLUMN = 54; + public static final int XML_ORDER_COLUMN = 57; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults Xml Persistence Unit Defaults}' class. * @@ -3329,7 +3418,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults() * @generated */ - public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 56; + public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 59; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata Xml Persistence Unit Metadata}' class. * @@ -3338,7 +3427,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata() * @generated */ - public static final int XML_PERSISTENCE_UNIT_METADATA = 57; + public static final int XML_PERSISTENCE_UNIT_METADATA = 60; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey Xml Primary Key}' class. * @@ -3347,7 +3436,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey() * @generated */ - public static final int XML_PRIMARY_KEY = 61; + public static final int XML_PRIMARY_KEY = 64; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned Xml Private Owned}' class. * @@ -3356,7 +3445,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned() * @generated */ - public static final int XML_PRIVATE_OWNED = 62; + public static final int XML_PRIVATE_OWNED = 65; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty Xml Property}' class. * @@ -3365,7 +3454,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty() * @generated */ - public static final int XML_PROPERTY = 63; + public static final int XML_PROPERTY = 66; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer Xml Property Container}' class. * @@ -3374,7 +3463,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer() * @generated */ - public static final int XML_PROPERTY_CONTAINER = 64; + public static final int XML_PROPERTY_CONTAINER = 67; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer Xml Query Container}' class. * @@ -3383,7 +3472,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer() * @generated */ - public static final int XML_QUERY_CONTAINER = 65; + public static final int XML_QUERY_CONTAINER = 68; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors Xml Query Redirectors}' class. * @@ -3392,7 +3481,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors() * @generated */ - public static final int XML_QUERY_REDIRECTORS = 66; + public static final int XML_QUERY_REDIRECTORS = 69; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly Xml Read Only}' class. * @@ -3401,7 +3490,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly() * @generated */ - public static final int XML_READ_ONLY = 68; + public static final int XML_READ_ONLY = 71; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert Xml Return Insert}' class. * @@ -3410,7 +3499,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert() * @generated */ - public static final int XML_RETURN_INSERT = 70; + public static final int XML_RETURN_INSERT = 73; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable Xml Secondary Table}' class. * @@ -3419,7 +3508,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlSecondaryTable() * @generated */ - public static final int XML_SECONDARY_TABLE = 72; + public static final int XML_SECONDARY_TABLE = 75; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter Xml Stored Procedure Parameter}' class. * @@ -3428,7 +3517,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter() * @generated */ - public static final int XML_STORED_PROCEDURE_PARAMETER = 73; + public static final int XML_STORED_PROCEDURE_PARAMETER = 76; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter Xml Struct Converter}' class. * @@ -3437,7 +3526,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter() * @generated */ - public static final int XML_STRUCT_CONVERTER = 75; + public static final int XML_STRUCT_CONVERTER = 78; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable Xml Table}' class. * @@ -3446,7 +3535,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTable() * @generated */ - public static final int XML_TABLE = 77; + public static final int XML_TABLE = 80; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator Xml Table Generator}' class. * @@ -3455,7 +3544,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTableGenerator() * @generated */ - public static final int XML_TABLE_GENERATOR = 78; + public static final int XML_TABLE_GENERATOR = 81; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay Xml Time Of Day}' class. * @@ -3464,7 +3553,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay() * @generated */ - public static final int XML_TIME_OF_DAY = 80; + public static final int XML_TIME_OF_DAY = 84; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation Xml Transformation}' class. * @@ -3473,7 +3562,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation() * @generated */ - public static final int XML_TRANSFORMATION = 81; + public static final int XML_TRANSFORMATION = 85; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient Xml Transient}' class. * @@ -3482,7 +3571,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransient() * @generated */ - public static final int XML_TRANSIENT = 82; + public static final int XML_TRANSIENT = 86; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter Xml Type Converter}' class. * @@ -3491,7 +3580,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter() * @generated */ - public static final int XML_TYPE_CONVERTER = 83; + public static final int XML_TYPE_CONVERTER = 87; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne Xml Variable One To One}' class. * @@ -3500,7 +3589,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne() * @generated */ - public static final int XML_VARIABLE_ONE_TO_ONE = 87; + public static final int XML_VARIABLE_ONE_TO_ONE = 92; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion Xml Version}' class. * @@ -3509,7 +3598,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion() * @generated */ - public static final int XML_VERSION = 88; + public static final int XML_VERSION = 93; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning Xml Hash Partitioning}' class. * @@ -3518,7 +3607,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlHashPartitioning() * @generated */ - public static final int XML_HASH_PARTITIONING = 33; + public static final int XML_HASH_PARTITIONING = 34; /** * The feature id for the 'Name' attribute. * @@ -3616,13 +3705,29 @@ */ public static final int XML_ID__INDEX = OrmPackage.XML_ID_FEATURE_COUNT + 0; /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_ID__UUID_GENERATOR = OrmPackage.XML_ID_FEATURE_COUNT + 1; + /** + * The feature id for the 'Field' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_ID__FIELD = OrmPackage.XML_ID_FEATURE_COUNT + 2; + /** * The feature id for the 'Cache Index' containment reference. * * * @generated * @ordered */ - public static final int XML_ID__CACHE_INDEX = OrmPackage.XML_ID_FEATURE_COUNT + 1; + public static final int XML_ID__CACHE_INDEX = OrmPackage.XML_ID_FEATURE_COUNT + 3; /** * The feature id for the 'Access Methods' containment reference. * @@ -3630,7 +3735,7 @@ * @generated * @ordered */ - public static final int XML_ID__ACCESS_METHODS = OrmPackage.XML_ID_FEATURE_COUNT + 2; + public static final int XML_ID__ACCESS_METHODS = OrmPackage.XML_ID_FEATURE_COUNT + 4; /** * The feature id for the 'Properties' containment reference list. * @@ -3638,7 +3743,7 @@ * @generated * @ordered */ - public static final int XML_ID__PROPERTIES = OrmPackage.XML_ID_FEATURE_COUNT + 3; + public static final int XML_ID__PROPERTIES = OrmPackage.XML_ID_FEATURE_COUNT + 5; /** * The feature id for the 'Attribute Type' attribute. * @@ -3646,7 +3751,7 @@ * @generated * @ordered */ - public static final int XML_ID__ATTRIBUTE_TYPE = OrmPackage.XML_ID_FEATURE_COUNT + 4; + public static final int XML_ID__ATTRIBUTE_TYPE = OrmPackage.XML_ID_FEATURE_COUNT + 6; /** * The feature id for the 'Mutable' attribute. * @@ -3654,7 +3759,7 @@ * @generated * @ordered */ - public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 5; + public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 7; /** * The feature id for the 'Convert' attribute. * @@ -3662,7 +3767,7 @@ * @generated * @ordered */ - public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 6; + public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 8; /** * The feature id for the 'Converters' containment reference list. * @@ -3670,7 +3775,7 @@ * @generated * @ordered */ - public static final int XML_ID__CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 7; + public static final int XML_ID__CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 9; /** * The feature id for the 'Type Converters' containment reference list. * @@ -3678,7 +3783,7 @@ * @generated * @ordered */ - public static final int XML_ID__TYPE_CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 8; + public static final int XML_ID__TYPE_CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 10; /** * The feature id for the 'Object Type Converters' containment reference list. * @@ -3686,7 +3791,7 @@ * @generated * @ordered */ - public static final int XML_ID__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 9; + public static final int XML_ID__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 11; /** * The feature id for the 'Struct Converters' containment reference list. * @@ -3694,7 +3799,7 @@ * @generated * @ordered */ - public static final int XML_ID__STRUCT_CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 10; + public static final int XML_ID__STRUCT_CONVERTERS = OrmPackage.XML_ID_FEATURE_COUNT + 12; /** * The number of structural features of the 'Xml Id' class. * @@ -3702,7 +3807,7 @@ * @generated * @ordered */ - public static final int XML_ID_FEATURE_COUNT = OrmPackage.XML_ID_FEATURE_COUNT + 11; + public static final int XML_ID_FEATURE_COUNT = OrmPackage.XML_ID_FEATURE_COUNT + 13; /** * The feature id for the 'Name' attribute. * @@ -3784,6 +3889,39 @@ */ public static final int XML_JOIN_FETCH_FEATURE_COUNT = 1; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField Xml Join Field}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinField() + * @generated + */ + public static final int XML_JOIN_FIELD = 39; + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_JOIN_FIELD__NAME = EclipseLinkOrmV2_4Package.XML_JOIN_FIELD_24__NAME; + /** + * The feature id for the 'Referenced Field Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_JOIN_FIELD__REFERENCED_FIELD_NAME = EclipseLinkOrmV2_4Package.XML_JOIN_FIELD_24__REFERENCED_FIELD_NAME; + /** + * The number of structural features of the 'Xml Join Field' class. + * + * + * @generated + * @ordered + */ + public static final int XML_JOIN_FIELD_FEATURE_COUNT = EclipseLinkOrmV2_4Package.XML_JOIN_FIELD_24_FEATURE_COUNT + 0; + /** * The feature id for the 'Name' attribute. * * @@ -4120,13 +4258,21 @@ */ public static final int XML_MANY_TO_MANY__NON_CACHEABLE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 17; /** + * The feature id for the 'Join Fields' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_MANY_TO_MANY__JOIN_FIELDS = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 18; + /** * The feature id for the 'Access Methods' containment reference. * * * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 18; + public static final int XML_MANY_TO_MANY__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 19; /** * The feature id for the 'Properties' containment reference list. * @@ -4134,7 +4280,7 @@ * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 19; + public static final int XML_MANY_TO_MANY__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 20; /** * The feature id for the 'Attribute Type' attribute. * @@ -4142,7 +4288,7 @@ * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 20; + public static final int XML_MANY_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 21; /** * The feature id for the 'Join Fetch' attribute. * @@ -4150,7 +4296,7 @@ * @generated * @ordered */ - public static final int XML_MANY_TO_MANY__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 21; + public static final int XML_MANY_TO_MANY__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 22; /** * The number of structural features of the 'Xml Many To Many' class. * @@ -4158,7 +4304,7 @@ * @generated * @ordered */ - public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 22; + public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 23; /** * The feature id for the 'Access' attribute. * @@ -4688,13 +4834,21 @@ */ public static final int XML_MAPPED_SUPERCLASS__PLSQL_TABLES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 30; /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS__UUID_GENERATOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 31; + /** * The feature id for the 'Cache Index' containment reference. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CACHE_INDEX = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 31; + public static final int XML_MAPPED_SUPERCLASS__CACHE_INDEX = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 32; /** * The feature id for the 'Read Only' attribute. * @@ -4702,7 +4856,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 32; + public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 33; /** * The feature id for the 'Customizer' containment reference. * @@ -4710,7 +4864,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 33; + public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 34; /** * The feature id for the 'Change Tracking' containment reference. * @@ -4718,7 +4872,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 34; + public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 35; /** * The feature id for the 'Cache' containment reference. * @@ -4726,7 +4880,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 35; + public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 36; /** * The feature id for the 'Existence Checking' attribute. * @@ -4734,7 +4888,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 36; + public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 37; /** * The feature id for the 'Converters' containment reference list. * @@ -4742,7 +4896,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 37; + public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 38; /** * The feature id for the 'Type Converters' containment reference list. * @@ -4750,7 +4904,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 38; + public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 39; /** * The feature id for the 'Object Type Converters' containment reference list. * @@ -4758,7 +4912,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 39; + public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 40; /** * The feature id for the 'Struct Converters' containment reference list. * @@ -4766,7 +4920,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 40; + public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 41; /** * The feature id for the 'Properties' containment reference list. * @@ -4774,7 +4928,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 41; + public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 42; /** * The feature id for the 'Optimistic Locking' containment reference. * @@ -4782,7 +4936,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 42; + public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 43; /** * The feature id for the 'Copy Policy' containment reference. * @@ -4790,7 +4944,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 43; + public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 44; /** * The feature id for the 'Instantiation Copy Policy' containment reference. * @@ -4798,7 +4952,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 44; + public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 45; /** * The feature id for the 'Clone Copy Policy' containment reference. * @@ -4806,7 +4960,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 45; + public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 46; /** * The feature id for the 'Exclude Default Mappings' attribute. * @@ -4814,7 +4968,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 46; + public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 47; /** * The number of structural features of the 'Xml Mapped Superclass' class. * @@ -4822,7 +4976,7 @@ * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 47; + public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 48; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant Xml Multitenant}' class. * @@ -4831,7 +4985,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant() * @generated */ - public static final int XML_MULTITENANT = 42; + public static final int XML_MULTITENANT = 44; /** * The feature id for the 'Type' attribute. * @@ -4857,13 +5011,21 @@ */ public static final int XML_MULTITENANT__INCLUDE_CRITERIA = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23_FEATURE_COUNT + 0; /** + * The feature id for the 'Tenant Table Discriminator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23_FEATURE_COUNT + 1; + /** * The number of structural features of the 'Xml Multitenant' class. * * * @generated * @ordered */ - public static final int XML_MULTITENANT_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23_FEATURE_COUNT + 1; + public static final int XML_MULTITENANT_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenantHolder Xml Multitenant Holder}' class. * @@ -4872,7 +5034,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenantHolder() * @generated */ - public static final int XML_MULTITENANT_HOLDER = 43; + public static final int XML_MULTITENANT_HOLDER = 45; /** * The feature id for the 'Multitenant' containment reference. * @@ -4913,7 +5075,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredFunctionQuery() * @generated */ - public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY = 46; + public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY = 48; /** * The feature id for the 'Name' attribute. * @@ -4938,7 +5100,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredProcedureQuery() * @generated */ - public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY = 47; + public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY = 49; /** * The feature id for the 'Name' attribute. * @@ -4963,7 +5125,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredFunctionQuery() * @generated */ - public static final int XML_NAMED_STORED_FUNCTION_QUERY = 48; + public static final int XML_NAMED_STORED_FUNCTION_QUERY = 50; /** * The feature id for the 'Name' attribute. * @@ -5045,6 +5207,39 @@ */ public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = 7; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql Xml No Sql}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNoSql() + * @generated + */ + public static final int XML_NO_SQL = 52; + /** + * The feature id for the 'Data Type' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NO_SQL__DATA_TYPE = EclipseLinkOrmV2_4Package.XML_NO_SQL_24__DATA_TYPE; + /** + * The feature id for the 'Data Format' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NO_SQL__DATA_FORMAT = EclipseLinkOrmV2_4Package.XML_NO_SQL_24__DATA_FORMAT; + /** + * The number of structural features of the 'Xml No Sql' class. + * + * + * @generated + * @ordered + */ + public static final int XML_NO_SQL_FEATURE_COUNT = EclipseLinkOrmV2_4Package.XML_NO_SQL_24_FEATURE_COUNT + 0; + /** * The feature id for the 'Name' attribute. * * @@ -5381,13 +5576,21 @@ */ public static final int XML_ONE_TO_MANY__NONCACHEABLE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 17; /** + * The feature id for the 'Join Fields' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY__JOIN_FIELDS = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 18; + /** * The feature id for the 'Delete All' attribute. * * * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__DELETE_ALL = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 18; + public static final int XML_ONE_TO_MANY__DELETE_ALL = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 19; /** * The feature id for the 'Access Methods' containment reference. * @@ -5395,7 +5598,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 19; + public static final int XML_ONE_TO_MANY__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 20; /** * The feature id for the 'Properties' containment reference list. * @@ -5403,7 +5606,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 20; + public static final int XML_ONE_TO_MANY__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 21; /** * The feature id for the 'Attribute Type' attribute. * @@ -5411,7 +5614,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 21; + public static final int XML_ONE_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 22; /** * The feature id for the 'Private Owned' attribute. * @@ -5419,7 +5622,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 22; + public static final int XML_ONE_TO_MANY__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 23; /** * The feature id for the 'Join Fetch' attribute. * @@ -5427,7 +5630,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 23; + public static final int XML_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 24; /** * The number of structural features of the 'Xml One To Many' class. * @@ -5435,7 +5638,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 24; + public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 25; /** * The feature id for the 'Access' attribute. * @@ -5637,13 +5840,21 @@ */ public static final int XML_ONE_TO_ONE__NON_CACHEABLE = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 11; /** + * The feature id for the 'Join Fields' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_ONE__JOIN_FIELDS = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 12; + /** * The feature id for the 'Access Methods' containment reference. * * * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 12; + public static final int XML_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 13; /** * The feature id for the 'Properties' containment reference list. * @@ -5651,7 +5862,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 13; + public static final int XML_ONE_TO_ONE__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 14; /** * The feature id for the 'Attribute Type' attribute. * @@ -5659,7 +5870,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__ATTRIBUTE_TYPE = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 14; + public static final int XML_ONE_TO_ONE__ATTRIBUTE_TYPE = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 15; /** * The feature id for the 'Private Owned' attribute. * @@ -5667,7 +5878,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 15; + public static final int XML_ONE_TO_ONE__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 16; /** * The feature id for the 'Join Fetch' attribute. * @@ -5675,7 +5886,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_ONE__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 16; + public static final int XML_ONE_TO_ONE__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 17; /** * The number of structural features of the 'Xml One To One' class. * @@ -5683,7 +5894,7 @@ * @generated * @ordered */ - public static final int XML_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 17; + public static final int XML_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 18; /** * The feature id for the 'Type' attribute. * @@ -5780,7 +5991,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioning() * @generated */ - public static final int XML_PARTITIONING = 55; + public static final int XML_PARTITIONING = 58; /** * The feature id for the 'Name' attribute. * @@ -5925,7 +6136,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPinnedPartitioning() * @generated */ - public static final int XML_PINNED_PARTITIONING = 58; + public static final int XML_PINNED_PARTITIONING = 61; /** * The feature id for the 'Name' attribute. * @@ -5950,7 +6161,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlRecord() * @generated */ - public static final int XML_PLSQL_RECORD = 59; + public static final int XML_PLSQL_RECORD = 62; /** * The feature id for the 'Name' attribute. * @@ -5975,7 +6186,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlTable() * @generated */ - public static final int XML_PLSQL_TABLE = 60; + public static final int XML_PLSQL_TABLE = 63; /** * The feature id for the 'Name' attribute. * @@ -6176,7 +6387,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRangePartitioning() * @generated */ - public static final int XML_RANGE_PARTITIONING = 67; + public static final int XML_RANGE_PARTITIONING = 70; /** * The feature id for the 'Name' attribute. * @@ -6217,7 +6428,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReplicationPartitioning() * @generated */ - public static final int XML_REPLICATION_PARTITIONING = 69; + public static final int XML_REPLICATION_PARTITIONING = 72; /** * The feature id for the 'Name' attribute. * @@ -6258,7 +6469,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRoundRobinPartitioning() * @generated */ - public static final int XML_ROUND_ROBIN_PARTITIONING = 71; + public static final int XML_ROUND_ROBIN_PARTITIONING = 74; /** * The feature id for the 'Name' attribute. * @@ -6395,7 +6606,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStruct() * @generated */ - public static final int XML_STRUCT = 74; + public static final int XML_STRUCT = 77; /** * The feature id for the 'Name' attribute. * @@ -6444,7 +6655,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructure() * @generated */ - public static final int XML_STRUCTURE = 76; + public static final int XML_STRUCTURE = 79; /** * The feature id for the 'Access' attribute. * @@ -6653,7 +6864,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn() * @generated */ - public static final int XML_TENANT_DISCRIMINATOR_COLUMN = 79; + public static final int XML_TENANT_DISCRIMINATOR_COLUMN = 82; /** * The feature id for the 'Column Definition' attribute. * @@ -6719,6 +6930,39 @@ */ public static final int XML_TENANT_DISCRIMINATOR_COLUMN_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 3; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator Xml Tenant Table Discriminator}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantTableDiscriminator() + * @generated + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR = 83; + /** + * The feature id for the 'Context Property' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY = EclipseLinkOrmV2_4Package.XML_TENANT_TABLE_DISCRIMINATOR_24__CONTEXT_PROPERTY; + /** + * The feature id for the 'Type' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR__TYPE = EclipseLinkOrmV2_4Package.XML_TENANT_TABLE_DISCRIMINATOR_24__TYPE; + /** + * The number of structural features of the 'Xml Tenant Table Discriminator' class. + * + * + * @generated + * @ordered + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR_FEATURE_COUNT = EclipseLinkOrmV2_4Package.XML_TENANT_TABLE_DISCRIMINATOR_24_FEATURE_COUNT + 0; + /** * The feature id for the 'Hour' attribute. * * @@ -6894,7 +7138,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeMapping() * @generated */ - public static final int XML_TYPE_MAPPING = 84; + public static final int XML_TYPE_MAPPING = 88; /** * The feature id for the 'Access' attribute. * @@ -6967,7 +7211,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUnionPartitioning() * @generated */ - public static final int XML_UNION_PARTITIONING = 85; + public static final int XML_UNION_PARTITIONING = 89; /** * The feature id for the 'Name' attribute. * @@ -6985,6 +7229,55 @@ */ public static final int XML_UNION_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_UNION_PARTITIONING_22_FEATURE_COUNT + 0; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator Xml Uuid Generator}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUuidGenerator() + * @generated + */ + public static final int XML_UUID_GENERATOR = 90; + /** + * The feature id for the 'Description' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR__DESCRIPTION = EclipseLinkOrmV2_4Package.XML_UUID_GENERATOR_24__DESCRIPTION; + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR__NAME = EclipseLinkOrmV2_4Package.XML_UUID_GENERATOR_24__NAME; + /** + * The feature id for the 'Initial Value' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR__INITIAL_VALUE = EclipseLinkOrmV2_4Package.XML_UUID_GENERATOR_24__INITIAL_VALUE; + /** + * The feature id for the 'Allocation Size' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR__ALLOCATION_SIZE = EclipseLinkOrmV2_4Package.XML_UUID_GENERATOR_24__ALLOCATION_SIZE; + /** + * The number of structural features of the 'Xml Uuid Generator' class. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR_FEATURE_COUNT = EclipseLinkOrmV2_4Package.XML_UUID_GENERATOR_24_FEATURE_COUNT + 0; + /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning Xml Value Partitioning}' class. * * @@ -6992,7 +7285,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlValuePartitioning() * @generated */ - public static final int XML_VALUE_PARTITIONING = 86; + public static final int XML_VALUE_PARTITIONING = 91; /** * The feature id for the 'Name' attribute. * @@ -7289,7 +7582,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType() * @generated */ - public static final int CACHE_COORDINATION_TYPE = 89; + public static final int CACHE_COORDINATION_TYPE = 94; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType Cache Type}' enum. * @@ -7298,7 +7591,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType() * @generated */ - public static final int CACHE_TYPE = 90; + public static final int CACHE_TYPE = 95; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType Xml Change Tracking Type}' enum. * @@ -7307,7 +7600,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType() * @generated */ - public static final int XML_CHANGE_TRACKING_TYPE = 91; + public static final int XML_CHANGE_TRACKING_TYPE = 96; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection Xml Direction}' enum. * @@ -7316,7 +7609,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection() * @generated */ - public static final int XML_DIRECTION = 92; + public static final int XML_DIRECTION = 97; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType Existence Type}' enum. * @@ -7325,7 +7618,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType() * @generated */ - public static final int EXISTENCE_TYPE = 93; + public static final int EXISTENCE_TYPE = 98; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType Xml Join Fetch Type}' enum. * @@ -7334,7 +7627,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType() * @generated */ - public static final int XML_JOIN_FETCH_TYPE = 94; + public static final int XML_JOIN_FETCH_TYPE = 99; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType Xml Optimistic Locking Type}' enum. * @@ -7343,7 +7636,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType() * @generated */ - public static final int XML_OPTIMISTIC_LOCKING_TYPE = 95; + public static final int XML_OPTIMISTIC_LOCKING_TYPE = 100; /** * * @@ -7547,6 +7840,12 @@ * * @generated */ + private EClass xmlFieldEClass = null; + /** + * + * + * @generated + */ private EClass xmlIdEClass = null; /** * @@ -7571,6 +7870,12 @@ * * @generated */ + private EClass xmlJoinFieldEClass = null; + /** + * + * + * @generated + */ private EClass xmlJoinTableEClass = null; /** * @@ -7643,6 +7948,12 @@ * * @generated */ + private EClass xmlNoSqlEClass = null; + /** + * + * + * @generated + */ private EClass xmlObjectTypeConverterEClass = null; /** * @@ -7781,6 +8092,12 @@ * * @generated */ + private EClass xmlTenantTableDiscriminatorEClass = null; + /** + * + * + * @generated + */ private EClass xmlTimeOfDayEClass = null; /** * @@ -7877,6 +8194,12 @@ * * @generated */ + private EClass xmlUuidGeneratorEClass = null; + /** + * + * + * @generated + */ private EClass xmlValuePartitioningEClass = null; /** * @@ -9055,6 +9378,19 @@ } /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField Xml Field}'. + * + * + * @return the meta object for class 'Xml Field'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField + * @generated + */ + public EClass getXmlField() + { + return xmlFieldEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId Xml Id}'. * * @@ -9121,6 +9457,19 @@ } /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField Xml Join Field}'. + * + * + * @return the meta object for class 'Xml Join Field'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField + * @generated + */ + public EClass getXmlJoinField() + { + return xmlJoinFieldEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable Xml Join Table}'. * * @@ -9487,6 +9836,19 @@ } /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql Xml No Sql}'. + * + * + * @return the meta object for class 'Xml No Sql'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql + * @generated + */ + public EClass getXmlNoSql() + { + return xmlNoSqlEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter Xml Object Type Converter}'. * * @@ -10094,6 +10456,19 @@ } /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator Xml Tenant Table Discriminator}'. + * + * + * @return the meta object for class 'Xml Tenant Table Discriminator'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator + * @generated + */ + public EClass getXmlTenantTableDiscriminator() + { + return xmlTenantTableDiscriminatorEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay Xml Time Of Day}'. * * @@ -10400,6 +10775,19 @@ } /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator Xml Uuid Generator}'. + * + * + * @return the meta object for class 'Xml Uuid Generator'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator + * @generated + */ + public EClass getXmlUuidGenerator() + { + return xmlUuidGeneratorEClass; + } + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning Xml Value Partitioning}'. * * @@ -10645,6 +11033,8 @@ xmlFetchGroupEClass = createEClass(XML_FETCH_GROUP); + xmlFieldEClass = createEClass(XML_FIELD); + xmlHashPartitioningEClass = createEClass(XML_HASH_PARTITIONING); xmlIdEClass = createEClass(XML_ID); @@ -10656,6 +11046,8 @@ xmlJoinFetchEClass = createEClass(XML_JOIN_FETCH); createEAttribute(xmlJoinFetchEClass, XML_JOIN_FETCH__JOIN_FETCH); + xmlJoinFieldEClass = createEClass(XML_JOIN_FIELD); + xmlJoinTableEClass = createEClass(XML_JOIN_TABLE); xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY); @@ -10695,6 +11087,8 @@ createEReference(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__HINTS); createEReference(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS); + xmlNoSqlEClass = createEClass(XML_NO_SQL); + xmlObjectTypeConverterEClass = createEClass(XML_OBJECT_TYPE_CONVERTER); createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__DATA_TYPE); createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE); @@ -10777,6 +11171,8 @@ xmlTenantDiscriminatorColumnEClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN); + xmlTenantTableDiscriminatorEClass = createEClass(XML_TENANT_TABLE_DISCRIMINATOR); + xmlTimeOfDayEClass = createEClass(XML_TIME_OF_DAY); createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__HOUR); createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__MINUTE); @@ -10795,6 +11191,8 @@ xmlUnionPartitioningEClass = createEClass(XML_UNION_PARTITIONING); + xmlUuidGeneratorEClass = createEClass(XML_UUID_GENERATOR); + xmlValuePartitioningEClass = createEClass(XML_VALUE_PARTITIONING); xmlVariableOneToOneEClass = createEClass(XML_VARIABLE_ONE_TO_ONE); @@ -10902,11 +11300,13 @@ xmlEmbeddableEClass.getESuperTypes().add(this.getXmlTypeMapping()); xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlEmbeddable_2_2()); xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlEmbeddable_2_3()); + xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlEmbeddable_2_4()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlCustomizerHolder()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlConverterContainer()); xmlEmbeddableEClass.getESuperTypes().add(this.getXmlPropertyContainer()); xmlEmbeddedEClass.getESuperTypes().add(theOrmPackage.getXmlEmbedded()); + xmlEmbeddedEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlEmbedded_2_4()); xmlEmbeddedEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlEmbeddedIdEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedId()); xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAttributeMapping()); @@ -10929,10 +11329,12 @@ xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEntityMappings_2_1()); xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlEntityMappings_2_2()); xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlEntityMappings_2_3()); + xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlEntityMappings_2_4()); xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlConverterContainer()); xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlQueryContainer()); xmlFetchAttributeEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchAttribute_2_1()); xmlFetchGroupEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchGroup_2_1()); + xmlFieldEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlField_2_4()); xmlHashPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlHashPartitioning_2_2()); xmlIdEClass.getESuperTypes().add(theOrmPackage.getXmlId()); xmlIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlId_2_2()); @@ -10942,12 +11344,14 @@ xmlIdEClass.getESuperTypes().add(this.getXmlConvertibleMapping()); xmlIdEClass.getESuperTypes().add(this.getXmlConverterContainer()); xmlIndexEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlIndex_2_2()); + xmlJoinFieldEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlJoinField_2_4()); xmlJoinTableEClass.getESuperTypes().add(theOrmPackage.getXmlJoinTable()); xmlJoinTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlJoinTable_2_2()); xmlManyToManyEClass.getESuperTypes().add(theOrmPackage.getXmlManyToMany()); xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlManyToMany_2_0()); xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlManyToMany_2_1()); xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlManyToMany_2_2()); + xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlManyToMany_2_4()); xmlManyToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlManyToManyEClass.getESuperTypes().add(this.getXmlJoinFetch()); xmlManyToOneEClass.getESuperTypes().add(theOrmPackage.getXmlManyToOne()); @@ -10974,6 +11378,7 @@ xmlNamedPlsqlStoredFunctionQueryEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlNamedPlsqlStoredFunctionQuery_2_3()); xmlNamedPlsqlStoredProcedureQueryEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlNamedPlsqlStoredProcedureQuery_2_3()); xmlNamedStoredFunctionQueryEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlNamedStoredFunctionQuery_2_3()); + xmlNoSqlEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlNoSql_2_4()); xmlObjectTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter()); xmlOneToManyEClass.getESuperTypes().add(theOrmPackage.getXmlOneToMany()); xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOneToMany_2_0()); @@ -10986,6 +11391,7 @@ xmlOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOne()); xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlOneToOne_2_1()); xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlOneToOne_2_2()); + xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlOneToOne_2_4()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlPrivateOwned()); xmlOneToOneEClass.getESuperTypes().add(this.getXmlJoinFetch()); @@ -11019,6 +11425,7 @@ xmlTableGeneratorEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTableGenerator_2_2()); xmlTenantDiscriminatorColumnEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlBaseDiscriminatorColumn()); xmlTenantDiscriminatorColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlTenantDiscriminatorColumn_2_3()); + xmlTenantTableDiscriminatorEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlTenantTableDiscriminator_2_4()); xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping()); xmlTransientEClass.getESuperTypes().add(theOrmPackage.getXmlTransient()); @@ -11027,6 +11434,7 @@ xmlTypeMappingEClass.getESuperTypes().add(theOrmPackage.getXmlTypeMapping()); xmlTypeMappingEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlTypeMapping_2_1()); xmlUnionPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlUnionPartitioning_2_2()); + xmlUuidGeneratorEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlUuidGenerator_2_4()); xmlValuePartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlValuePartitioning_2_2()); xmlVariableOneToOneEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping()); xmlVariableOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping()); @@ -11149,6 +11557,8 @@ initEClass(xmlFetchGroupEClass, XmlFetchGroup.class, "XmlFetchGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlFieldEClass, XmlField.class, "XmlField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlHashPartitioningEClass, XmlHashPartitioning.class, "XmlHashPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlIdEClass, XmlId.class, "XmlId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -11160,6 +11570,8 @@ initEClass(xmlJoinFetchEClass, XmlJoinFetch.class, "XmlJoinFetch", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlJoinFetch_JoinFetch(), this.getXmlJoinFetchType(), "joinFetch", null, 0, 1, XmlJoinFetch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlJoinFieldEClass, XmlJoinField.class, "XmlJoinField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlJoinTableEClass, XmlJoinTable.class, "XmlJoinTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlManyToManyEClass, XmlManyToMany.class, "XmlManyToMany", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -11199,6 +11611,8 @@ initEReference(getXmlNamedStoredProcedureQuery_Hints(), theOrmPackage.getXmlQueryHint(), null, "hints", null, 0, -1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlNamedStoredProcedureQuery_Parameters(), this.getXmlStoredProcedureParameter(), null, "parameters", null, 0, -1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlNoSqlEClass, XmlNoSql.class, "XmlNoSql", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlObjectTypeConverterEClass, XmlObjectTypeConverter.class, "XmlObjectTypeConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlObjectTypeConverter_DataType(), theXMLTypePackage.getString(), "dataType", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlObjectTypeConverter_ObjectType(), theXMLTypePackage.getString(), "objectType", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -11281,6 +11695,8 @@ initEClass(xmlTenantDiscriminatorColumnEClass, XmlTenantDiscriminatorColumn.class, "XmlTenantDiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlTenantTableDiscriminatorEClass, XmlTenantTableDiscriminator.class, "XmlTenantTableDiscriminator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlTimeOfDayEClass, XmlTimeOfDay.class, "XmlTimeOfDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlTimeOfDay_Hour(), theXMLTypePackage.getIntObject(), "hour", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlTimeOfDay_Minute(), theXMLTypePackage.getIntObject(), "minute", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -11299,6 +11715,8 @@ initEClass(xmlUnionPartitioningEClass, XmlUnionPartitioning.class, "XmlUnionPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlUuidGeneratorEClass, XmlUuidGenerator.class, "XmlUuidGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(xmlValuePartitioningEClass, XmlValuePartitioning.class, "XmlValuePartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(xmlVariableOneToOneEClass, XmlVariableOneToOne.class, "XmlVariableOneToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -12051,6 +12469,16 @@ public static final EClass XML_FETCH_GROUP = eINSTANCE.getXmlFetchGroup(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField Xml Field}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlField() + * @generated + */ + public static final EClass XML_FIELD = eINSTANCE.getXmlField(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId Xml Id}' class. * * @@ -12099,6 +12527,16 @@ public static final EAttribute XML_JOIN_FETCH__JOIN_FETCH = eINSTANCE.getXmlJoinFetch_JoinFetch(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField Xml Join Field}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinField() + * @generated + */ + public static final EClass XML_JOIN_FIELD = eINSTANCE.getXmlJoinField(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable Xml Join Table}' class. * * @@ -12339,6 +12777,16 @@ public static final EReference XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = eINSTANCE.getXmlNamedStoredProcedureQuery_Parameters(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql Xml No Sql}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNoSql() + * @generated + */ + public static final EClass XML_NO_SQL = eINSTANCE.getXmlNoSql(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter Xml Object Type Converter}' class. * * @@ -12745,6 +13193,16 @@ public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN = eINSTANCE.getXmlTenantDiscriminatorColumn(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator Xml Tenant Table Discriminator}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantTableDiscriminator() + * @generated + */ + public static final EClass XML_TENANT_TABLE_DISCRIMINATOR = eINSTANCE.getXmlTenantTableDiscriminator(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay Xml Time Of Day}' class. * * @@ -12961,6 +13419,16 @@ public static final EClass XML_UNION_PARTITIONING = eINSTANCE.getXmlUnionPartitioning(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator Xml Uuid Generator}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUuidGenerator() + * @generated + */ + public static final EClass XML_UUID_GENERATOR = eINSTANCE.getXmlUuidGenerator(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning Xml Value Partitioning}' class. * * Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java,v retrieving revision 1.6 diff -u -r1.6 XmlBasic.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java 7 Mar 2012 04:38:24 -0000 1.6 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java 24 May 2012 01:28:50 -0000 @@ -41,6 +41,9 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4; 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.XmlField_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.XmlUuidGenerator_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -132,6 +135,24 @@ */ protected XmlIndex_2_2 index; /** + * The cached value of the '{@link #getUuidGenerator() Uuid Generator}' containment reference. + * + * + * @see #getUuidGenerator() + * @generated + * @ordered + */ + protected XmlUuidGenerator_2_4 uuidGenerator; + /** + * The cached value of the '{@link #getField() Field}' containment reference. + * + * + * @see #getField() + * @generated + * @ordered + */ + protected XmlField_2_4 field; + /** * The cached value of the '{@link #getCacheIndex() Cache Index}' containment reference. * * @@ -804,6 +825,66 @@ } /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_4_Field() + * @model containment="true" + * @generated + */ + public XmlField_2_4 getField() + { + return field; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs) + { + XmlField_2_4 oldField = field; + field = newField; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__FIELD, oldField, newField); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + public void setField(XmlField_2_4 newField) + { + if (newField != field) + { + NotificationChain msgs = null; + if (field != null) + msgs = ((InternalEObject)field).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__FIELD, null, msgs); + if (newField != null) + msgs = ((InternalEObject)newField).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__FIELD, null, msgs); + msgs = basicSetField(newField, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__FIELD, newField, newField)); + } + + /** * Returns the value of the 'Cache Index' containment reference. * *

@@ -864,6 +945,66 @@ } /** + * Returns the value of the 'Uuid Generator' containment reference. + * + *

+ * If the meaning of the 'Uuid Generator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generator' containment reference. + * @see #setUuidGenerator(XmlUuidGenerator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator() + * @model containment="true" + * @generated + */ + public XmlUuidGenerator_2_4 getUuidGenerator() + { + return uuidGenerator; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs) + { + XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator; + uuidGenerator = newUuidGenerator; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR, oldUuidGenerator, newUuidGenerator); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getUuidGenerator Uuid Generator}' containment reference. + * + * + * @param value the new value of the 'Uuid Generator' containment reference. + * @see #getUuidGenerator() + * @generated + */ + public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator) + { + if (newUuidGenerator != uuidGenerator) + { + NotificationChain msgs = null; + if (uuidGenerator != null) + msgs = ((InternalEObject)uuidGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR, null, msgs); + if (newUuidGenerator != null) + msgs = ((InternalEObject)newUuidGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR, null, msgs); + msgs = basicSetUuidGenerator(newUuidGenerator, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR, newUuidGenerator, newUuidGenerator)); + } + + /** * Returns the value of the 'Access Methods' containment reference. * *

@@ -966,6 +1107,10 @@ return basicSetReturnInsert(null, msgs); case EclipseLinkOrmPackage.XML_BASIC__INDEX: return basicSetIndex(null, msgs); + case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR: + return basicSetUuidGenerator(null, msgs); + case EclipseLinkOrmPackage.XML_BASIC__FIELD: + return basicSetField(null, msgs); case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: return basicSetCacheIndex(null, msgs); case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: @@ -1006,6 +1151,10 @@ return getReturnUpdate(); case EclipseLinkOrmPackage.XML_BASIC__INDEX: return getIndex(); + case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR: + return getUuidGenerator(); + case EclipseLinkOrmPackage.XML_BASIC__FIELD: + return getField(); case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: return getCacheIndex(); case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: @@ -1059,6 +1208,12 @@ case EclipseLinkOrmPackage.XML_BASIC__INDEX: setIndex((XmlIndex_2_2)newValue); return; + case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)newValue); + return; + case EclipseLinkOrmPackage.XML_BASIC__FIELD: + setField((XmlField_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)newValue); return; @@ -1126,6 +1281,12 @@ case EclipseLinkOrmPackage.XML_BASIC__INDEX: setIndex((XmlIndex_2_2)null); return; + case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)null); + return; + case EclipseLinkOrmPackage.XML_BASIC__FIELD: + setField((XmlField_2_4)null); + return; case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)null); return; @@ -1182,6 +1343,10 @@ return RETURN_UPDATE_EDEFAULT == null ? returnUpdate != null : !RETURN_UPDATE_EDEFAULT.equals(returnUpdate); case EclipseLinkOrmPackage.XML_BASIC__INDEX: return index != null; + case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR: + return uuidGenerator != null; + case EclipseLinkOrmPackage.XML_BASIC__FIELD: + return field != null; case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: return cacheIndex != null; case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: @@ -1248,10 +1413,19 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR: return EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlBasic_2_4.class) { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_BASIC__FIELD: return EclipseLinkOrmV2_4Package.XML_BASIC_24__FIELD; case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_BASIC_24__CACHE_INDEX; default: return -1; } @@ -1352,10 +1526,19 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlBasic_2_4.class) { switch (baseFeatureID) { + case EclipseLinkOrmV2_4Package.XML_BASIC_24__FIELD: return EclipseLinkOrmPackage.XML_BASIC__FIELD; case EclipseLinkOrmV2_4Package.XML_BASIC_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX; default: return -1; } @@ -1468,6 +1651,7 @@ buildMutableTranslator(), buildAttributeTypeTranslator(), buildColumnTranslator(), + buildFieldTranslator(), buildIndexTranslator(), buildCacheIndexTranslator(), buildGeneratedValueTranslator(), @@ -1481,6 +1665,7 @@ buildStructConverterTranslator(), buildTableGeneratorTranslator(), buildSequenceGeneratorTranslator(), + buildUuidGeneratorTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator(), buildReturnInsertTranslator(), @@ -1551,6 +1736,14 @@ return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlAttributeMapping_AttributeType(), Translator.DOM_ATTRIBUTE); } + protected static Translator buildUuidGeneratorTranslator() { + return XmlUuidGenerator.buildTranslator(EclipseLink2_4.UUID_GENERATOR, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlGeneratorContainer2_4_UuidGenerator()); + } + + protected static Translator buildFieldTranslator() { + return XmlField.buildTranslator(EclipseLink2_4.FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlBasic_2_4_Field()); + } + // *********** content assist ************ protected TextRange getConvertCodeAssistTextRange() { Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java,v retrieving revision 1.8 diff -u -r1.8 XmlElementCollection.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java 7 Mar 2012 04:38:24 -0000 1.8 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java 24 May 2012 01:28:51 -0000 @@ -56,6 +56,7 @@ 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.XmlElementCollection_2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -396,6 +397,16 @@ protected String compositeMember = COMPOSITE_MEMBER_EDEFAULT; /** + * The cached value of the '{@link #getField() Field}' containment reference. + * + * + * @see #getField() + * @generated + * @ordered + */ + protected XmlField_2_4 field; + + /** * The default value of the '{@link #isDeleteAll() Delete All}' attribute. * * @@ -1366,6 +1377,66 @@ } /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_4_Field() + * @model containment="true" + * @generated + */ + public XmlField_2_4 getField() + { + return field; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs) + { + XmlField_2_4 oldField = field; + field = newField; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD, oldField, newField); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + public void setField(XmlField_2_4 newField) + { + if (newField != field) + { + NotificationChain msgs = null; + if (field != null) + msgs = ((InternalEObject)field).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD, null, msgs); + if (newField != null) + msgs = ((InternalEObject)newField).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD, null, msgs); + msgs = basicSetField(newField, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD, newField, newField)); + } + + /** * Returns the value of the 'Delete All' attribute. * *

@@ -1534,6 +1605,8 @@ return basicSetHashPartitioning(null, msgs); case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING: return basicSetUnionPartitioning(null, msgs); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD: + return basicSetField(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -1596,6 +1669,8 @@ return isNoncacheable(); case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER: return getCompositeMember(); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD: + return getField(); case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL: return isDeleteAll(); } @@ -1691,6 +1766,9 @@ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER: setCompositeMember((String)newValue); return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD: + setField((XmlField_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL: setDeleteAll((Boolean)newValue); return; @@ -1780,6 +1858,9 @@ case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER: setCompositeMember(COMPOSITE_MEMBER_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD: + setField((XmlField_2_4)null); + return; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL: setDeleteAll(DELETE_ALL_EDEFAULT); return; @@ -1845,6 +1926,8 @@ return noncacheable != NONCACHEABLE_EDEFAULT; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER: return COMPOSITE_MEMBER_EDEFAULT == null ? compositeMember != null : !COMPOSITE_MEMBER_EDEFAULT.equals(compositeMember); + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD: + return field != null; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL: return deleteAll != DELETE_ALL_EDEFAULT; } @@ -1985,6 +2068,7 @@ { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD: return EclipseLinkOrmV2_4Package.XML_ELEMENT_COLLECTION_24__FIELD; case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL: return EclipseLinkOrmV2_4Package.XML_ELEMENT_COLLECTION_24__DELETE_ALL; default: return -1; } @@ -2126,6 +2210,7 @@ { switch (baseFeatureID) { + case EclipseLinkOrmV2_4Package.XML_ELEMENT_COLLECTION_24__FIELD: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__FIELD; case EclipseLinkOrmV2_4Package.XML_ELEMENT_COLLECTION_24__DELETE_ALL: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL; default: return -1; } @@ -2238,6 +2323,7 @@ XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_ObjectTypeConverters()), XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_StructConverters()), XmlCollectionTable.buildTranslator(JPA2_0.COLLECTION_TABLE, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_CollectionTable()), + buildFieldTranslator(), buildCascadeOnDeleteTranslator(), buildJoinFetchTranslator(), buildBatchFetchTranslator(), @@ -2304,6 +2390,10 @@ return new EmptyTagBooleanTranslator(EclipseLink2_4.DELETE_ALL, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlElementCollection_2_4_DeleteAll()); } + protected static Translator buildFieldTranslator() { + return XmlField.buildTranslator(EclipseLink2_4.FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlElementCollection_2_4_Field()); + } + // *********** content assist ************ protected TextRange getConvertCodeAssistTextRange() { Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java,v retrieving revision 1.5 diff -u -r1.5 XmlEmbeddable.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java 5 Mar 2012 15:17:27 -0000 1.5 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java 24 May 2012 01:28:51 -0000 @@ -32,13 +32,16 @@ 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.XmlTypeMapping_2_1; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_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.XmlEmbeddable_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3; +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.XmlEmbeddable_2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -71,7 +74,7 @@ * @model kind="class" * @generated */ -public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable implements XmlTypeMapping, XmlEmbeddable_2_2, XmlEmbeddable_2_3, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlConverterContainer, XmlPropertyContainer +public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable implements XmlTypeMapping, XmlEmbeddable_2_2, XmlEmbeddable_2_3, XmlEmbeddable_2_4, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlConverterContainer, XmlPropertyContainer { /** * The cached value of the '{@link #getAccessMethods() Access Methods}' containment reference. @@ -154,6 +157,16 @@ protected XmlStruct_2_3 struct; /** + * The cached value of the '{@link #getNoSql() No Sql}' containment reference. + * + * + * @see #getNoSql() + * @generated + * @ordered + */ + protected XmlNoSql_2_4 noSql; + + /** * The cached value of the '{@link #getCustomizer() Customizer}' containment reference. * * @@ -542,6 +555,66 @@ } /** + * Returns the value of the 'No Sql' containment reference. + * + *

+ * If the meaning of the 'No Sql' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'No Sql' containment reference. + * @see #setNoSql(XmlNoSql_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_4_NoSql() + * @model containment="true" + * @generated + */ + public XmlNoSql_2_4 getNoSql() + { + return noSql; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetNoSql(XmlNoSql_2_4 newNoSql, NotificationChain msgs) + { + XmlNoSql_2_4 oldNoSql = noSql; + noSql = newNoSql; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL, oldNoSql, newNoSql); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getNoSql No Sql}' containment reference. + * + * + * @param value the new value of the 'No Sql' containment reference. + * @see #getNoSql() + * @generated + */ + public void setNoSql(XmlNoSql_2_4 newNoSql) + { + if (newNoSql != noSql) + { + NotificationChain msgs = null; + if (noSql != null) + msgs = ((InternalEObject)noSql).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL, null, msgs); + if (newNoSql != null) + msgs = ((InternalEObject)newNoSql).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL, null, msgs); + msgs = basicSetNoSql(newNoSql, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL, newNoSql, newNoSql)); + } + + /** * Returns the value of the 'Customizer' containment reference. * *

@@ -1013,6 +1086,8 @@ return ((InternalEList)getPlsqlTables()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT: return basicSetStruct(null, msgs); + case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL: + return basicSetNoSql(null, msgs); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return basicSetCustomizer(null, msgs); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: @@ -1061,6 +1136,8 @@ return getPlsqlTables(); case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT: return getStruct(); + case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL: + return getNoSql(); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return getCustomizer(); case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: @@ -1123,6 +1200,9 @@ case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT: setStruct((XmlStruct_2_3)newValue); return; + case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL: + setNoSql((XmlNoSql_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: setCustomizer((XmlClassReference)newValue); return; @@ -1196,6 +1276,9 @@ case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT: setStruct((XmlStruct_2_3)null); return; + case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL: + setNoSql((XmlNoSql_2_4)null); + return; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: setCustomizer((XmlClassReference)null); return; @@ -1257,6 +1340,8 @@ return plsqlTables != null && !plsqlTables.isEmpty(); case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT: return struct != null; + case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL: + return noSql != null; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return customizer != null; case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: @@ -1347,6 +1432,14 @@ default: return -1; } } + if (baseClass == XmlEmbeddable_2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL: return EclipseLinkOrmV2_4Package.XML_EMBEDDABLE_24__NO_SQL; + default: return -1; + } + } if (baseClass == XmlCustomizerHolder.class) { switch (derivedFeatureID) @@ -1449,6 +1542,14 @@ default: return -1; } } + if (baseClass == XmlEmbeddable_2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_EMBEDDABLE_24__NO_SQL: return EclipseLinkOrmPackage.XML_EMBEDDABLE__NO_SQL; + default: return -1; + } + } if (baseClass == XmlCustomizerHolder.class) { switch (baseFeatureID) @@ -1534,6 +1635,7 @@ buildCustomizerTranslator(), buildChangeTrackingTranslator(), XmlStruct.buildTranslator(EclipseLink2_3.STRUCT, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEmbeddable_2_3_Struct()), + buildNoSqlTranslator(), buildConverterTranslator(), buildTypeConverterTranslator(), buildObjectTypeConverterTranslator(), @@ -1598,7 +1700,7 @@ } protected static Translator buildParentClassTranslator() { - return new Translator(EclipseLink2_2.PARENT_CLASS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlTypeMapping_2_1_ParentClass(), Translator.DOM_ATTRIBUTE); + return new Translator(EclipseLink2_1.PARENT_CLASS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlTypeMapping_2_1_ParentClass(), Translator.DOM_ATTRIBUTE); } protected static Translator buildAttributeOverrideTranslator() { @@ -1608,4 +1710,9 @@ protected static Translator buildAssociationOverrideTranslator() { return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides()); } + + protected static Translator buildNoSqlTranslator() { + return XmlNoSql.buildTranslator(EclipseLink2_4.NO_SQL, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlEmbeddable_2_4_NoSql()); + } + } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java,v retrieving revision 1.3 diff -u -r1.3 XmlEmbedded.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java 29 Feb 2012 20:27:20 -0000 1.3 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java 24 May 2012 01:28:52 -0000 @@ -20,8 +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.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.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package; 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; @@ -45,9 +48,19 @@ * @model kind="class" * @generated */ -public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded implements XmlAttributeMapping +public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded implements XmlEmbedded_2_4, XmlAttributeMapping { /** + * The cached value of the '{@link #getField() Field}' containment reference. + * + * + * @see #getField() + * @generated + * @ordered + */ + protected XmlField_2_4 field; + + /** * The cached value of the '{@link #getAccessMethods() Access Methods}' containment reference. * * @@ -109,6 +122,66 @@ } /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded_2_4_Field() + * @model containment="true" + * @generated + */ + public XmlField_2_4 getField() + { + return field; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs) + { + XmlField_2_4 oldField = field; + field = newField; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED__FIELD, oldField, newField); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + public void setField(XmlField_2_4 newField) + { + if (newField != field) + { + NotificationChain msgs = null; + if (field != null) + msgs = ((InternalEObject)field).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED__FIELD, null, msgs); + if (newField != null) + msgs = ((InternalEObject)newField).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED__FIELD, null, msgs); + msgs = basicSetField(newField, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED__FIELD, newField, newField)); + } + + /** * Returns the value of the 'Attribute Type' attribute. * *

@@ -236,6 +309,8 @@ { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD: + return basicSetField(null, msgs); case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: @@ -254,6 +329,8 @@ { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD: + return getField(); case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: @@ -275,6 +352,9 @@ { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD: + setField((XmlField_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -299,6 +379,9 @@ { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD: + setField((XmlField_2_4)null); + return; case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -322,6 +405,8 @@ { switch (featureID) { + case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD: + return field != null; case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: @@ -340,6 +425,14 @@ @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) { + if (baseClass == XmlEmbedded_2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_EMBEDDED__FIELD: return EclipseLinkOrmV2_4Package.XML_EMBEDDED_24__FIELD; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -375,6 +468,14 @@ @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { + if (baseClass == XmlEmbedded_2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_EMBEDDED_24__FIELD: return EclipseLinkOrmPackage.XML_EMBEDDED__FIELD; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -441,7 +542,8 @@ buildAttributeOverrideTranslator(), buildAssociationOverrideTranslator(), buildPropertyTranslator(), - buildAccessMethodsTranslator() + buildAccessMethodsTranslator(), + buildFieldTranslator() }; } @@ -457,4 +559,8 @@ return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlAttributeMapping_AttributeType(), Translator.DOM_ATTRIBUTE); } + protected static Translator buildFieldTranslator() { + return XmlField.buildTranslator(EclipseLink2_4.FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlEmbedded_2_4_Field()); + } + } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java,v retrieving revision 1.7 diff -u -r1.7 XmlEntity.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java 5 Mar 2012 15:17:27 -0000 1.7 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java 24 May 2012 01:28:54 -0000 @@ -63,6 +63,9 @@ 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; 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; @@ -390,6 +393,16 @@ protected XmlStruct_2_3 struct; /** + * The cached value of the '{@link #getUuidGenerator() Uuid Generator}' containment reference. + * + * + * @see #getUuidGenerator() + * @generated + * @ordered + */ + protected XmlUuidGenerator_2_4 uuidGenerator; + + /** * The cached value of the '{@link #getCacheIndex() Cache Index}' containment reference. * * @@ -400,6 +413,16 @@ protected XmlCacheIndex_2_4 cacheIndex; /** + * The cached value of the '{@link #getNoSql() No Sql}' containment reference. + * + * + * @see #getNoSql() + * @generated + * @ordered + */ + protected XmlNoSql_2_4 noSql; + + /** * The default value of the '{@link #getReadOnly() Read Only}' attribute. * * @@ -2502,6 +2525,126 @@ } /** + * Returns the value of the 'No Sql' containment reference. + * + *

+ * If the meaning of the 'No Sql' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'No Sql' containment reference. + * @see #setNoSql(XmlNoSql_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_4_NoSql() + * @model containment="true" + * @generated + */ + public XmlNoSql_2_4 getNoSql() + { + return noSql; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetNoSql(XmlNoSql_2_4 newNoSql, NotificationChain msgs) + { + XmlNoSql_2_4 oldNoSql = noSql; + noSql = newNoSql; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__NO_SQL, oldNoSql, newNoSql); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getNoSql No Sql}' containment reference. + * + * + * @param value the new value of the 'No Sql' containment reference. + * @see #getNoSql() + * @generated + */ + public void setNoSql(XmlNoSql_2_4 newNoSql) + { + if (newNoSql != noSql) + { + NotificationChain msgs = null; + if (noSql != null) + msgs = ((InternalEObject)noSql).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__NO_SQL, null, msgs); + if (newNoSql != null) + msgs = ((InternalEObject)newNoSql).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__NO_SQL, null, msgs); + msgs = basicSetNoSql(newNoSql, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__NO_SQL, newNoSql, newNoSql)); + } + + /** + * Returns the value of the 'Uuid Generator' containment reference. + * + *

+ * If the meaning of the 'Uuid Generator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generator' containment reference. + * @see #setUuidGenerator(XmlUuidGenerator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator() + * @model containment="true" + * @generated + */ + public XmlUuidGenerator_2_4 getUuidGenerator() + { + return uuidGenerator; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs) + { + XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator; + uuidGenerator = newUuidGenerator; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR, oldUuidGenerator, newUuidGenerator); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getUuidGenerator Uuid Generator}' containment reference. + * + * + * @param value the new value of the 'Uuid Generator' containment reference. + * @see #getUuidGenerator() + * @generated + */ + public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator) + { + if (newUuidGenerator != uuidGenerator) + { + NotificationChain msgs = null; + if (uuidGenerator != null) + msgs = ((InternalEObject)uuidGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR, null, msgs); + if (newUuidGenerator != null) + msgs = ((InternalEObject)newUuidGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR, null, msgs); + msgs = basicSetUuidGenerator(newUuidGenerator, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR, newUuidGenerator, newUuidGenerator)); + } + + /** * Returns the value of the 'Additional Criteria' containment reference. * *

@@ -2652,8 +2795,12 @@ return ((InternalEList)getPlsqlTables()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY__STRUCT: return basicSetStruct(null, msgs); + case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR: + return basicSetUuidGenerator(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: return basicSetCacheIndex(null, msgs); + case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL: + return basicSetNoSql(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER: return basicSetCustomizer(null, msgs); case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING: @@ -2746,8 +2893,12 @@ return getPlsqlTables(); case EclipseLinkOrmPackage.XML_ENTITY__STRUCT: return getStruct(); + case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR: + return getUuidGenerator(); case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: return getCacheIndex(); + case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL: + return getNoSql(); case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY: return getReadOnly(); case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER: @@ -2879,9 +3030,15 @@ case EclipseLinkOrmPackage.XML_ENTITY__STRUCT: setStruct((XmlStruct_2_3)newValue); return; + case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)newValue); return; + case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL: + setNoSql((XmlNoSql_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY: setReadOnly((Boolean)newValue); return; @@ -3028,9 +3185,15 @@ case EclipseLinkOrmPackage.XML_ENTITY__STRUCT: setStruct((XmlStruct_2_3)null); return; + case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)null); + return; case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)null); return; + case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL: + setNoSql((XmlNoSql_2_4)null); + return; case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY: setReadOnly(READ_ONLY_EDEFAULT); return; @@ -3145,8 +3308,12 @@ return plsqlTables != null && !plsqlTables.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY__STRUCT: return struct != null; + case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR: + return uuidGenerator != null; case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: return cacheIndex != null; + case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL: + return noSql != null; case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY: return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly); case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER: @@ -3294,11 +3461,20 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR: return EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlEntity_2_4.class) { switch (derivedFeatureID) { case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_ENTITY_24__CACHE_INDEX; + case EclipseLinkOrmPackage.XML_ENTITY__NO_SQL: return EclipseLinkOrmV2_4Package.XML_ENTITY_24__NO_SQL; default: return -1; } } @@ -3476,11 +3652,20 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR: return EclipseLinkOrmPackage.XML_ENTITY__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlEntity_2_4.class) { switch (baseFeatureID) { case EclipseLinkOrmV2_4Package.XML_ENTITY_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX; + case EclipseLinkOrmV2_4Package.XML_ENTITY_24__NO_SQL: return EclipseLinkOrmPackage.XML_ENTITY__NO_SQL; default: return -1; } } @@ -3614,6 +3799,7 @@ buildSecondaryTableTranslator(), XmlStruct.buildTranslator(EclipseLink2_3.STRUCT, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_Struct()), buildPrimaryKeyJoinColumnTranslator(), + buildNoSqlTranslator(), buildCascadeOnDeleteTranslator(), buildIndexTranslator(), buildIdClassTranslator(), @@ -3636,6 +3822,7 @@ buildCloneCopyPolicyTranslator(), buildSequenceGeneratorTranslator(), buildTableGeneratorTranslator(), + XmlUuidGenerator.buildTranslator(EclipseLink2_4.UUID_GENERATOR, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlGeneratorContainer2_4_UuidGenerator()), XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()), XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()), XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()), @@ -3794,4 +3981,8 @@ protected static Translator buildPartitionedTranslator() { return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned()); } + + protected static Translator buildNoSqlTranslator() { + return XmlNoSql.buildTranslator(EclipseLink2_4.NO_SQL, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlEntity_2_4_NoSql()); + } } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java,v retrieving revision 1.6 diff -u -r1.6 XmlEntityMappings.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java 5 Dec 2011 17:49:03 -0000 1.6 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java 24 May 2012 01:28:54 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -53,6 +53,9 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_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; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -76,7 +79,7 @@ * @model kind="class" * @generated */ -public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings implements XmlEntityMappings_2_1, XmlEntityMappings_2_2, XmlEntityMappings_2_3, XmlConverterContainer, XmlQueryContainer +public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings implements XmlEntityMappings_2_1, XmlEntityMappings_2_2, XmlEntityMappings_2_3, XmlEntityMappings_2_4, XmlConverterContainer, XmlQueryContainer { /** * The cached value of the '{@link #getAccessMethods() Access Methods}' containment reference. @@ -229,6 +232,16 @@ protected EList plsqlTables; /** + * The cached value of the '{@link #getUuidGenerators() Uuid Generators}' containment reference list. + * + * + * @see #getUuidGenerators() + * @generated + * @ordered + */ + protected EList uuidGenerators; + + /** * The cached value of the '{@link #getConverters() Converters}' containment reference list. * * @@ -682,6 +695,29 @@ } /** + * Returns the value of the 'Uuid Generators' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4}. + * + *

+ * If the meaning of the 'Uuid Generators' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generators' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_4_UuidGenerators() + * @model containment="true" + * @generated + */ + public EList getUuidGenerators() + { + if (uuidGenerators == null) + { + uuidGenerators = new EObjectContainmentEList(XmlUuidGenerator_2_4.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS); + } + return uuidGenerators; + } + + /** * Returns the value of the 'Converters' containment reference list. * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}. * @@ -836,6 +872,8 @@ return ((InternalEList)getPlsqlRecords()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES: return ((InternalEList)getPlsqlTables()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS: + return ((InternalEList)getUuidGenerators()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: return ((InternalEList)getConverters()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS: @@ -890,6 +928,8 @@ return getPlsqlRecords(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES: return getPlsqlTables(); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS: + return getUuidGenerators(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: return getConverters(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS: @@ -974,6 +1014,10 @@ getPlsqlTables().clear(); getPlsqlTables().addAll((Collection)newValue); return; + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS: + getUuidGenerators().clear(); + getUuidGenerators().addAll((Collection)newValue); + return; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: getConverters().clear(); getConverters().addAll((Collection)newValue); @@ -1053,6 +1097,9 @@ case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES: getPlsqlTables().clear(); return; + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS: + getUuidGenerators().clear(); + return; case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: getConverters().clear(); return; @@ -1112,6 +1159,8 @@ return plsqlRecords != null && !plsqlRecords.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES: return plsqlTables != null && !plsqlTables.isEmpty(); + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS: + return uuidGenerators != null && !uuidGenerators.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: return converters != null && !converters.isEmpty(); case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS: @@ -1177,6 +1226,14 @@ default: return -1; } } + if (baseClass == XmlEntityMappings_2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS: return EclipseLinkOrmV2_4Package.XML_ENTITY_MAPPINGS_24__UUID_GENERATORS; + default: return -1; + } + } if (baseClass == XmlConverterContainer.class) { switch (derivedFeatureID) @@ -1250,6 +1307,14 @@ default: return -1; } } + if (baseClass == XmlEntityMappings_2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_ENTITY_MAPPINGS_24__UUID_GENERATORS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UUID_GENERATORS; + default: return -1; + } + } if (baseClass == XmlConverterContainer.class) { switch (baseFeatureID) @@ -1338,6 +1403,7 @@ XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterContainer_StructConverters()), XmlSequenceGenerator.buildTranslator(JPA.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_SequenceGenerators()), XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_TableGenerators()), + XmlUuidGenerator.buildTranslator(EclipseLink2_4.UUID_GENERATOR, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlEntityMappings_2_4_UuidGenerators()), XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_Partitioning()), XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_ReplicationPartitioning()), XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_RoundRobinPartitioning()), Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlField.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,224 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; + +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.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; + +/** + * + * A representation of the model object 'Xml Field'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlField() + * @model kind="class" + * @generated + */ +public class XmlField extends AbstractJpaEObject implements XmlField_2_4 +{ + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * + * + * @generated + */ + protected XmlField() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_FIELD; + } + + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlField_2_4_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getName() + { + return name; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlField#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + public void setName(String newName) + { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FIELD__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_FIELD__NAME: + return getName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_FIELD__NAME: + setName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_FIELD__NAME: + setName(NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_FIELD__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(')'); + return result.toString(); + } + + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + EclipseLinkOrmPackage.eINSTANCE.getXmlField(), + buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildNameTranslator(), + }; + } + + protected static Translator buildNameTranslator() { + return new Translator(JPA.NAME, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlField_2_4_Name(), Translator.DOM_ATTRIBUTE); + } +} // XmlField Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java,v retrieving revision 1.7 diff -u -r1.7 XmlId.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java 7 Mar 2012 04:38:24 -0000 1.7 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java 24 May 2012 01:28:58 -0000 @@ -32,7 +32,10 @@ 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; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_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.XmlId_2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -69,6 +72,26 @@ protected XmlIndex_2_2 index; /** + * The cached value of the '{@link #getUuidGenerator() Uuid Generator}' containment reference. + * + * + * @see #getUuidGenerator() + * @generated + * @ordered + */ + protected XmlUuidGenerator_2_4 uuidGenerator; + + /** + * The cached value of the '{@link #getField() Field}' containment reference. + * + * + * @see #getField() + * @generated + * @ordered + */ + protected XmlField_2_4 field; + + /** * The cached value of the '{@link #getCacheIndex() Cache Index}' containment reference. * * @@ -315,6 +338,66 @@ } /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_4_Field() + * @model containment="true" + * @generated + */ + public XmlField_2_4 getField() + { + return field; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetField(XmlField_2_4 newField, NotificationChain msgs) + { + XmlField_2_4 oldField = field; + field = newField; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__FIELD, oldField, newField); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + public void setField(XmlField_2_4 newField) + { + if (newField != field) + { + NotificationChain msgs = null; + if (field != null) + msgs = ((InternalEObject)field).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__FIELD, null, msgs); + if (newField != null) + msgs = ((InternalEObject)newField).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__FIELD, null, msgs); + msgs = basicSetField(newField, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__FIELD, newField, newField)); + } + + /** * Returns the value of the 'Cache Index' containment reference. * *

@@ -375,6 +458,66 @@ } /** + * Returns the value of the 'Uuid Generator' containment reference. + * + *

+ * If the meaning of the 'Uuid Generator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generator' containment reference. + * @see #setUuidGenerator(XmlUuidGenerator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator() + * @model containment="true" + * @generated + */ + public XmlUuidGenerator_2_4 getUuidGenerator() + { + return uuidGenerator; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs) + { + XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator; + uuidGenerator = newUuidGenerator; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR, oldUuidGenerator, newUuidGenerator); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getUuidGenerator Uuid Generator}' containment reference. + * + * + * @param value the new value of the 'Uuid Generator' containment reference. + * @see #getUuidGenerator() + * @generated + */ + public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator) + { + if (newUuidGenerator != uuidGenerator) + { + NotificationChain msgs = null; + if (uuidGenerator != null) + msgs = ((InternalEObject)uuidGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR, null, msgs); + if (newUuidGenerator != null) + msgs = ((InternalEObject)newUuidGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR, null, msgs); + msgs = basicSetUuidGenerator(newUuidGenerator, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR, newUuidGenerator, newUuidGenerator)); + } + + /** * Returns the value of the 'Mutable' attribute. * *

@@ -631,6 +774,10 @@ { case EclipseLinkOrmPackage.XML_ID__INDEX: return basicSetIndex(null, msgs); + case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR: + return basicSetUuidGenerator(null, msgs); + case EclipseLinkOrmPackage.XML_ID__FIELD: + return basicSetField(null, msgs); case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: return basicSetCacheIndex(null, msgs); case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: @@ -661,6 +808,10 @@ { case EclipseLinkOrmPackage.XML_ID__INDEX: return getIndex(); + case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR: + return getUuidGenerator(); + case EclipseLinkOrmPackage.XML_ID__FIELD: + return getField(); case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: return getCacheIndex(); case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: @@ -699,6 +850,12 @@ case EclipseLinkOrmPackage.XML_ID__INDEX: setIndex((XmlIndex_2_2)newValue); return; + case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)newValue); + return; + case EclipseLinkOrmPackage.XML_ID__FIELD: + setField((XmlField_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)newValue); return; @@ -751,6 +908,12 @@ case EclipseLinkOrmPackage.XML_ID__INDEX: setIndex((XmlIndex_2_2)null); return; + case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)null); + return; + case EclipseLinkOrmPackage.XML_ID__FIELD: + setField((XmlField_2_4)null); + return; case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)null); return; @@ -797,6 +960,10 @@ { case EclipseLinkOrmPackage.XML_ID__INDEX: return index != null; + case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR: + return uuidGenerator != null; + case EclipseLinkOrmPackage.XML_ID__FIELD: + return field != null; case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: return cacheIndex != null; case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: @@ -837,10 +1004,19 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR: return EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlId_2_4.class) { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_ID__FIELD: return EclipseLinkOrmV2_4Package.XML_ID_24__FIELD; case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_ID_24__CACHE_INDEX; default: return -1; } @@ -915,10 +1091,19 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR: return EclipseLinkOrmPackage.XML_ID__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlId_2_4.class) { switch (baseFeatureID) { + case EclipseLinkOrmV2_4Package.XML_ID_24__FIELD: return EclipseLinkOrmPackage.XML_ID__FIELD; case EclipseLinkOrmV2_4Package.XML_ID_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_ID__CACHE_INDEX; default: return -1; } @@ -1028,6 +1213,7 @@ buildMutableTranslator(), buildAttributeTypeTranslator(), buildColumnTranslator(), + buildFieldTranslator(), buildIndexTranslator(), buildCacheIndexTranslator(), buildGeneratedValueTranslator(), @@ -1040,6 +1226,7 @@ buildStructConverterTranslator(), buildTableGeneratorTranslator(), buildSequenceGeneratorTranslator(), + buildUuidGeneratorTranslator(), buildPropertyTranslator(), buildAccessMethodsTranslator() }; @@ -1097,6 +1284,15 @@ return XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_TableGenerator()); } + protected static Translator buildFieldTranslator() { + return XmlField.buildTranslator(EclipseLink2_4.FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlId_2_4_Field()); + } + + protected static Translator buildUuidGeneratorTranslator() { + return XmlUuidGenerator.buildTranslator(EclipseLink2_4.UUID_GENERATOR, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlGeneratorContainer2_4_UuidGenerator()); + } + + // *********** content assist ************ protected TextRange getConvertCodeAssistTextRange() { Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinField.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,295 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; + +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.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.wst.common.internal.emf.resource.Translator; + +/** + * + * A representation of the model object 'Xml Join Field'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinField() + * @model kind="class" + * @generated + */ +public class XmlJoinField extends AbstractJpaEObject implements XmlJoinField_2_4 +{ + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getReferencedFieldName() Referenced Field Name}' attribute. + * + * + * @see #getReferencedFieldName() + * @generated + * @ordered + */ + protected static final String REFERENCED_FIELD_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getReferencedFieldName() Referenced Field Name}' attribute. + * + * + * @see #getReferencedFieldName() + * @generated + * @ordered + */ + protected String referencedFieldName = REFERENCED_FIELD_NAME_EDEFAULT; + + /** + * + * + * @generated + */ + protected XmlJoinField() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_JOIN_FIELD; + } + + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinField_2_4_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getName() + { + return name; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + public void setName(String newName) + { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_JOIN_FIELD__NAME, oldName, name)); + } + + /** + * Returns the value of the 'Referenced Field Name' attribute. + * + *

+ * If the meaning of the 'Referenced Field Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Referenced Field Name' attribute. + * @see #setReferencedFieldName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinField_2_4_ReferencedFieldName() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getReferencedFieldName() + { + return referencedFieldName; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinField#getReferencedFieldName Referenced Field Name}' attribute. + * + * + * @param value the new value of the 'Referenced Field Name' attribute. + * @see #getReferencedFieldName() + * @generated + */ + public void setReferencedFieldName(String newReferencedFieldName) + { + String oldReferencedFieldName = referencedFieldName; + referencedFieldName = newReferencedFieldName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_JOIN_FIELD__REFERENCED_FIELD_NAME, oldReferencedFieldName, referencedFieldName)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_JOIN_FIELD__NAME: + return getName(); + case EclipseLinkOrmPackage.XML_JOIN_FIELD__REFERENCED_FIELD_NAME: + return getReferencedFieldName(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_JOIN_FIELD__NAME: + setName((String)newValue); + return; + case EclipseLinkOrmPackage.XML_JOIN_FIELD__REFERENCED_FIELD_NAME: + setReferencedFieldName((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_JOIN_FIELD__NAME: + setName(NAME_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_JOIN_FIELD__REFERENCED_FIELD_NAME: + setReferencedFieldName(REFERENCED_FIELD_NAME_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_JOIN_FIELD__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case EclipseLinkOrmPackage.XML_JOIN_FIELD__REFERENCED_FIELD_NAME: + return REFERENCED_FIELD_NAME_EDEFAULT == null ? referencedFieldName != null : !REFERENCED_FIELD_NAME_EDEFAULT.equals(referencedFieldName); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(", referencedFieldName: "); + result.append(referencedFieldName); + result.append(')'); + return result.toString(); + } + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + EclipseLinkOrmPackage.eINSTANCE.getXmlJoinField(), + buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildNameTranslator(), + buildReferencedFieldNameTranslator(), + }; + } + + protected static Translator buildNameTranslator() { + return new Translator(EclipseLink2_4.JOIN_FIELD__NAME, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlJoinField_2_4_Name(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildReferencedFieldNameTranslator() { + return new Translator(EclipseLink2_4.JOIN_FIELD__REFERENCED_FIELD_NAME, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlJoinField_2_4_ReferencedFieldName(), Translator.DOM_ATTRIBUTE); + } +} // XmlJoinField Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java,v retrieving revision 1.6 diff -u -r1.6 XmlManyToMany.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java 29 Feb 2012 20:27:20 -0000 1.6 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java 24 May 2012 01:28:59 -0000 @@ -49,6 +49,10 @@ 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_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.XmlManyToMany_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -72,7 +76,7 @@ * @model kind="class" * @generated */ -public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany implements XmlManyToMany_2_0, XmlManyToMany_2_1, XmlManyToMany_2_2, XmlAttributeMapping, XmlJoinFetch +public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany implements XmlManyToMany_2_0, XmlManyToMany_2_1, XmlManyToMany_2_2, XmlManyToMany_2_4, XmlAttributeMapping, XmlJoinFetch { /** * The cached value of the '{@link #getMapKeyAssociationOverrides() Map Key Association Overrides}' containment reference list. @@ -295,6 +299,16 @@ protected boolean nonCacheable = NON_CACHEABLE_EDEFAULT; /** + * The cached value of the '{@link #getJoinFields() Join Fields}' containment reference list. + * + * + * @see #getJoinFields() + * @generated + * @ordered + */ + protected EList joinFields; + + /** * The cached value of the '{@link #getAccessMethods() Access Methods}' containment reference. * * @@ -1240,6 +1254,29 @@ } /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_2_4_JoinFields() + * @model containment="true" + * @generated + */ + public EList getJoinFields() + { + if (joinFields == null) + { + joinFields = new EObjectContainmentEList(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS); + } + return joinFields; + } + + /** * Returns the value of the 'Access Methods' containment reference. * *

@@ -1360,6 +1397,8 @@ return basicSetHashPartitioning(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING: return basicSetUnionPartitioning(null, msgs); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS: + return ((InternalEList)getJoinFields()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: @@ -1414,6 +1453,8 @@ return getCascadeOnDelete(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE: return isNonCacheable(); + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS: + return getJoinFields(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: @@ -1496,6 +1537,10 @@ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE: setNonCacheable((Boolean)newValue); return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS: + getJoinFields().clear(); + getJoinFields().addAll((Collection)newValue); + return; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -1577,6 +1622,9 @@ case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE: setNonCacheable(NON_CACHEABLE_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS: + getJoinFields().clear(); + return; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -1639,6 +1687,8 @@ return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE: return nonCacheable != NON_CACHEABLE_EDEFAULT; + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS: + return joinFields != null && !joinFields.isEmpty(); case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: @@ -1733,6 +1783,14 @@ default: return -1; } } + if (baseClass == XmlManyToMany_2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS: return EclipseLinkOrmV2_4Package.XML_MANY_TO_MANY_24__JOIN_FIELDS; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -1850,6 +1908,14 @@ default: return -1; } } + if (baseClass == XmlManyToMany_2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_MANY_TO_MANY_24__JOIN_FIELDS: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FIELDS; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -1955,6 +2021,7 @@ buildObjectTypeConverterTranslator(), buildStructConverterTranslator(), buildJoinTableTranslator(), + buildJoinFieldTranslator(), buildCascadeTranslator(), buildCascadeOnDeleteTranslator(), buildJoinFetchTranslator(), @@ -2036,6 +2103,9 @@ protected static Translator buildPartitionedTranslator() { return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned()); - } + } + protected static Translator buildJoinFieldTranslator() { + return XmlJoinField.buildTranslator(EclipseLink2_4.JOIN_FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlManyToMany_2_4_JoinFields()); + } } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java,v retrieving revision 1.5 diff -u -r1.5 XmlManyToOne.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java 29 Feb 2012 20:27:20 -0000 1.5 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java 24 May 2012 01:29:00 -0000 @@ -36,6 +36,8 @@ 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_4.EclipseLink2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package; 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; @@ -1499,6 +1501,7 @@ buildIdTranslator(), buildJoinColumnTranslator(), buildJoinTableTranslator(), + buildJoinFieldTranslator(), buildCascadeTranslator(), buildJoinFetchTranslator(), buildBatchFetchTranslator(), @@ -1548,5 +1551,8 @@ protected static Translator buildPartitionedTranslator() { return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned()); } - + + protected static Translator buildJoinFieldTranslator() { + return XmlJoinField.buildTranslator(EclipseLink2_4.JOIN_FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlManyToOne_2_4_JoinFields()); + } } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java,v retrieving revision 1.8 diff -u -r1.8 XmlMappedSuperclass.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java 5 Mar 2012 15:17:27 -0000 1.8 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java 24 May 2012 01:29:01 -0000 @@ -71,7 +71,9 @@ 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; +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; @@ -449,6 +451,16 @@ protected EList plsqlTables; /** + * The cached value of the '{@link #getUuidGenerator() Uuid Generator}' containment reference. + * + * + * @see #getUuidGenerator() + * @generated + * @ordered + */ + protected XmlUuidGenerator_2_4 uuidGenerator; + + /** * The cached value of the '{@link #getCacheIndex() Cache Index}' containment reference. * * @@ -2666,6 +2678,66 @@ } /** + * Returns the value of the 'Uuid Generator' containment reference. + * + *

+ * If the meaning of the 'Uuid Generator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generator' containment reference. + * @see #setUuidGenerator(XmlUuidGenerator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer2_4_UuidGenerator() + * @model containment="true" + * @generated + */ + public XmlUuidGenerator_2_4 getUuidGenerator() + { + return uuidGenerator; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator, NotificationChain msgs) + { + XmlUuidGenerator_2_4 oldUuidGenerator = uuidGenerator; + uuidGenerator = newUuidGenerator; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR, oldUuidGenerator, newUuidGenerator); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getUuidGenerator Uuid Generator}' containment reference. + * + * + * @param value the new value of the 'Uuid Generator' containment reference. + * @see #getUuidGenerator() + * @generated + */ + public void setUuidGenerator(XmlUuidGenerator_2_4 newUuidGenerator) + { + if (newUuidGenerator != uuidGenerator) + { + NotificationChain msgs = null; + if (uuidGenerator != null) + msgs = ((InternalEObject)uuidGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR, null, msgs); + if (newUuidGenerator != null) + msgs = ((InternalEObject)newUuidGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR, null, msgs); + msgs = basicSetUuidGenerator(newUuidGenerator, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR, newUuidGenerator, newUuidGenerator)); + } + + /** * Returns the value of the 'Exclude Default Mappings' attribute. * *

@@ -2766,6 +2838,8 @@ return ((InternalEList)getPlsqlRecords()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES: return ((InternalEList)getPlsqlTables()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR: + return basicSetUuidGenerator(null, msgs); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX: return basicSetCacheIndex(null, msgs); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER: @@ -2868,6 +2942,8 @@ return getPlsqlRecords(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES: return getPlsqlTables(); + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR: + return getUuidGenerator(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX: return getCacheIndex(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY: @@ -3020,6 +3096,9 @@ getPlsqlTables().clear(); getPlsqlTables().addAll((Collection)newValue); return; + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)newValue); + return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)newValue); return; @@ -3180,6 +3259,9 @@ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES: getPlsqlTables().clear(); return; + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR: + setUuidGenerator((XmlUuidGenerator_2_4)null); + return; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX: setCacheIndex((XmlCacheIndex_2_4)null); return; @@ -3304,6 +3386,8 @@ return plsqlRecords != null && !plsqlRecords.isEmpty(); case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES: return plsqlTables != null && !plsqlTables.isEmpty(); + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR: + return uuidGenerator != null; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX: return cacheIndex != null; case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY: @@ -3498,6 +3582,14 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR: return EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlMappedSuperclass_2_4.class) { switch (derivedFeatureID) @@ -3719,6 +3811,14 @@ default: return -1; } } + if (baseClass == XmlGeneratorContainer2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UUID_GENERATOR; + default: return -1; + } + } if (baseClass == XmlMappedSuperclass_2_4.class) { switch (baseFeatureID) @@ -3864,6 +3964,7 @@ buildCloneCopyPolicyTranslator(), buildSequenceGeneratorTranslator(), buildTableGeneratorTranslator(), + buildUuidGeneratorTranslator(), buildNamedQueryTranslator(), buildNamedNativeQueryTranslator(), buildNamedStoredProcedureQueryTranslator(), @@ -4017,4 +4118,8 @@ protected static Translator buildAdditionalCriteriaTranslator() { return XmlAdditionalCriteria.buildTranslator(EclipseLink2_2.ADDITIONAL_CRITERIA, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlMappedSuperclass_2_2_AdditionalCriteria()); } + + protected static Translator buildUuidGeneratorTranslator() { + return XmlUuidGenerator.buildTranslator(EclipseLink2_4.UUID_GENERATOR, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlGeneratorContainer2_4_UuidGenerator()); + } } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java,v retrieving revision 1.6 diff -u -r1.6 XmlMultitenant.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java 21 Dec 2011 21:07:02 -0000 1.6 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java 24 May 2012 01:29:01 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -30,6 +30,7 @@ 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.XmlMultitenant_2_4; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; /** @@ -90,6 +91,16 @@ protected Boolean includeCriteria = INCLUDE_CRITERIA_EDEFAULT; /** + * The cached value of the '{@link #getTenantTableDiscriminator() Tenant Table Discriminator}' containment reference. + * + * + * @see #getTenantTableDiscriminator() + * @generated + * @ordered + */ + protected XmlTenantTableDiscriminator_2_4 tenantTableDiscriminator; + + /** * * * @generated @@ -207,6 +218,66 @@ } /** + * Returns the value of the 'Tenant Table Discriminator' containment reference. + * + *

+ * If the meaning of the 'Tenant Table Discriminator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Tenant Table Discriminator' containment reference. + * @see #setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant_2_4_TenantTableDiscriminator() + * @model containment="true" + * @generated + */ + public XmlTenantTableDiscriminator_2_4 getTenantTableDiscriminator() + { + return tenantTableDiscriminator; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4 newTenantTableDiscriminator, NotificationChain msgs) + { + XmlTenantTableDiscriminator_2_4 oldTenantTableDiscriminator = tenantTableDiscriminator; + tenantTableDiscriminator = newTenantTableDiscriminator; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR, oldTenantTableDiscriminator, newTenantTableDiscriminator); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant#getTenantTableDiscriminator Tenant Table Discriminator}' containment reference. + * + * + * @param value the new value of the 'Tenant Table Discriminator' containment reference. + * @see #getTenantTableDiscriminator() + * @generated + */ + public void setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4 newTenantTableDiscriminator) + { + if (newTenantTableDiscriminator != tenantTableDiscriminator) + { + NotificationChain msgs = null; + if (tenantTableDiscriminator != null) + msgs = ((InternalEObject)tenantTableDiscriminator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR, null, msgs); + if (newTenantTableDiscriminator != null) + msgs = ((InternalEObject)newTenantTableDiscriminator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR, null, msgs); + msgs = basicSetTenantTableDiscriminator(newTenantTableDiscriminator, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR, newTenantTableDiscriminator, newTenantTableDiscriminator)); + } + + /** * * * @generated @@ -218,6 +289,8 @@ { case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS: return ((InternalEList)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs); + case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR: + return basicSetTenantTableDiscriminator(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -238,6 +311,8 @@ return getTenantDiscriminatorColumns(); case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA: return getIncludeCriteria(); + case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR: + return getTenantTableDiscriminator(); } return super.eGet(featureID, resolve, coreType); } @@ -263,6 +338,9 @@ case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA: setIncludeCriteria((Boolean)newValue); return; + case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR: + setTenantTableDiscriminator((XmlTenantTableDiscriminator_2_4)newValue); + return; } super.eSet(featureID, newValue); } @@ -286,6 +364,9 @@ case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA: setIncludeCriteria(INCLUDE_CRITERIA_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR: + setTenantTableDiscriminator((XmlTenantTableDiscriminator_2_4)null); + return; } super.eUnset(featureID); } @@ -306,6 +387,8 @@ return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty(); case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA: return INCLUDE_CRITERIA_EDEFAULT == null ? includeCriteria != null : !INCLUDE_CRITERIA_EDEFAULT.equals(includeCriteria); + case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR: + return tenantTableDiscriminator != null; } return super.eIsSet(featureID); } @@ -323,6 +406,7 @@ switch (derivedFeatureID) { case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA: return EclipseLinkOrmV2_4Package.XML_MULTITENANT_24__INCLUDE_CRITERIA; + case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR: return EclipseLinkOrmV2_4Package.XML_MULTITENANT_24__TENANT_TABLE_DISCRIMINATOR; default: return -1; } } @@ -342,6 +426,7 @@ switch (baseFeatureID) { case EclipseLinkOrmV2_4Package.XML_MULTITENANT_24__INCLUDE_CRITERIA: return EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA; + case EclipseLinkOrmV2_4Package.XML_MULTITENANT_24__TENANT_TABLE_DISCRIMINATOR: return EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_TABLE_DISCRIMINATOR; default: return -1; } } @@ -385,7 +470,8 @@ return new Translator[] { buildTypeTranslator(), buildIncludeCriteriaTranslator(), - buildTenantDiscriminatorColumnsTranslator() + buildTenantDiscriminatorColumnsTranslator(), + buildTenantTableDiscriminatorTranslator() }; } @@ -401,4 +487,8 @@ return new Translator(EclipseLink2_4.MULTITENANT__INCLUDE_CRITERIA, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlMultitenant_2_4_IncludeCriteria(), Translator.DOM_ATTRIBUTE); } + protected static Translator buildTenantTableDiscriminatorTranslator() { + return XmlTenantTableDiscriminator.buildTranslator(EclipseLink2_4.TENANT_TABLE_DISCRIMINATOR, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlMultitenant_2_4_TenantTableDiscriminator()); + } + } // XmlMultitenant Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,294 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; + +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.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; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4; +import org.eclipse.wst.common.internal.emf.resource.Translator; + +/** + * + * A representation of the model object 'Xml No Sql'. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNoSql() + * @model kind="class" + * @generated + */ +public class XmlNoSql extends AbstractJpaEObject implements XmlNoSql_2_4 +{ + /** + * The default value of the '{@link #getDataType() Data Type}' attribute. + * + * + * @see #getDataType() + * @generated + * @ordered + */ + protected static final String DATA_TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDataType() Data Type}' attribute. + * + * + * @see #getDataType() + * @generated + * @ordered + */ + protected String dataType = DATA_TYPE_EDEFAULT; + + /** + * The default value of the '{@link #getDataFormat() Data Format}' attribute. + * + * + * @see #getDataFormat() + * @generated + * @ordered + */ + protected static final DataFormatType DATA_FORMAT_EDEFAULT = DataFormatType.XML; + + /** + * The cached value of the '{@link #getDataFormat() Data Format}' attribute. + * + * + * @see #getDataFormat() + * @generated + * @ordered + */ + protected DataFormatType dataFormat = DATA_FORMAT_EDEFAULT; + + /** + * + * + * @generated + */ + protected XmlNoSql() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_NO_SQL; + } + + /** + * Returns the value of the 'Data Type' attribute. + * + *

+ * If the meaning of the 'Data Type' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Data Type' attribute. + * @see #setDataType(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNoSql_2_4_DataType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getDataType() + { + return dataType; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql#getDataType Data Type}' attribute. + * + * + * @param value the new value of the 'Data Type' attribute. + * @see #getDataType() + * @generated + */ + public void setDataType(String newDataType) + { + String oldDataType = dataType; + dataType = newDataType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NO_SQL__DATA_TYPE, oldDataType, dataType)); + } + + /** + * Returns the value of the 'Data Format' attribute. + * The default value is "". + * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType}. + * + *

+ * If the meaning of the 'Data Format' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Data Format' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @see #setDataFormat(DataFormatType) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNoSql_2_4_DataFormat() + * @model default="" + * @generated + */ + public DataFormatType getDataFormat() + { + return dataFormat; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNoSql#getDataFormat Data Format}' attribute. + * + * + * @param value the new value of the 'Data Format' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @see #getDataFormat() + * @generated + */ + public void setDataFormat(DataFormatType newDataFormat) + { + DataFormatType oldDataFormat = dataFormat; + dataFormat = newDataFormat == null ? DATA_FORMAT_EDEFAULT : newDataFormat; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NO_SQL__DATA_FORMAT, oldDataFormat, dataFormat)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_TYPE: + return getDataType(); + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_FORMAT: + return getDataFormat(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_TYPE: + setDataType((String)newValue); + return; + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_FORMAT: + setDataFormat((DataFormatType)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_TYPE: + setDataType(DATA_TYPE_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_FORMAT: + setDataFormat(DATA_FORMAT_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_TYPE: + return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType); + case EclipseLinkOrmPackage.XML_NO_SQL__DATA_FORMAT: + return dataFormat != DATA_FORMAT_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (dataType: "); + result.append(dataType); + result.append(", dataFormat: "); + result.append(dataFormat); + result.append(')'); + return result.toString(); + } + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + EclipseLinkOrmPackage.eINSTANCE.getXmlNoSql(), + buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildDataTypeTranslator(), + buildDataFormatTranslator(), + }; + } + + protected static Translator buildDataTypeTranslator() { + return new Translator(EclipseLink2_4.NO_SQL__DATA_TYPE, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlNoSql_2_4_DataType(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildDataFormatTranslator() { + return new Translator(EclipseLink2_4.NO_SQL__DATA_FORMAT, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlNoSql_2_4_DataFormat(), Translator.DOM_ATTRIBUTE); + } +} // XmlNoSql Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java,v retrieving revision 1.7 diff -u -r1.7 XmlOneToMany.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java 29 Feb 2012 20:27:20 -0000 1.7 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java 24 May 2012 01:29:04 -0000 @@ -50,6 +50,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2; 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.XmlOneToMany_2_4; import org.eclipse.wst.common.internal.emf.resource.Translator; @@ -297,6 +298,16 @@ protected boolean noncacheable = NONCACHEABLE_EDEFAULT; /** + * The cached value of the '{@link #getJoinFields() Join Fields}' containment reference list. + * + * + * @see #getJoinFields() + * @generated + * @ordered + */ + protected EList joinFields; + + /** * The default value of the '{@link #isDeleteAll() Delete All}' attribute. * * @@ -1317,6 +1328,29 @@ } /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_2_4_JoinFields() + * @model containment="true" + * @generated + */ + public EList getJoinFields() + { + if (joinFields == null) + { + joinFields = new EObjectContainmentEList(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS); + } + return joinFields; + } + + /** * Returns the value of the 'Delete All' attribute. * *

@@ -1472,6 +1506,8 @@ return basicSetHashPartitioning(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING: return basicSetUnionPartitioning(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS: + return ((InternalEList)getJoinFields()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: @@ -1526,6 +1562,8 @@ return getCascadeOnDelete(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE: return isNoncacheable(); + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS: + return getJoinFields(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL: return isDeleteAll(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: @@ -1612,6 +1650,10 @@ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE: setNoncacheable((Boolean)newValue); return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS: + getJoinFields().clear(); + getJoinFields().addAll((Collection)newValue); + return; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL: setDeleteAll((Boolean)newValue); return; @@ -1699,6 +1741,9 @@ case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE: setNoncacheable(NONCACHEABLE_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS: + getJoinFields().clear(); + return; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL: setDeleteAll(DELETE_ALL_EDEFAULT); return; @@ -1767,6 +1812,8 @@ return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE: return noncacheable != NONCACHEABLE_EDEFAULT; + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS: + return joinFields != null && !joinFields.isEmpty(); case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL: return deleteAll != DELETE_ALL_EDEFAULT; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: @@ -1869,6 +1916,7 @@ { switch (derivedFeatureID) { + case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS: return EclipseLinkOrmV2_4Package.XML_ONE_TO_MANY_24__JOIN_FIELDS; case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL: return EclipseLinkOrmV2_4Package.XML_ONE_TO_MANY_24__DELETE_ALL; default: return -1; } @@ -2002,6 +2050,7 @@ { switch (baseFeatureID) { + case EclipseLinkOrmV2_4Package.XML_ONE_TO_MANY_24__JOIN_FIELDS: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FIELDS; case EclipseLinkOrmV2_4Package.XML_ONE_TO_MANY_24__DELETE_ALL: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL; default: return -1; } @@ -2129,6 +2178,7 @@ buildStructConverterTranslator(), buildJoinTableTranslator(), buildJoinColumnTranslator(), + buildJoinFieldTranslator(), buildCascadeTranslator(), buildCascadeOnDeleteTranslator(), buildPrivateOwnedTranslator(), @@ -2217,4 +2267,8 @@ protected static Translator buildDeleteAllTranslator() { return new EmptyTagBooleanTranslator(EclipseLink2_4.DELETE_ALL, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlOneToMany_2_4_DeleteAll()); } + + protected static Translator buildJoinFieldTranslator() { + return XmlJoinField.buildTranslator(EclipseLink2_4.JOIN_FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlOneToMany_2_4_JoinFields()); + } } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java,v retrieving revision 1.5 diff -u -r1.5 XmlOneToOne.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java 29 Feb 2012 20:27:20 -0000 1.5 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java 24 May 2012 01:29:04 -0000 @@ -37,6 +37,10 @@ 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_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; @@ -63,7 +67,7 @@ * @model kind="class" * @generated */ -public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne implements XmlOneToOne_2_1, XmlOneToOne_2_2, XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch +public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne implements XmlOneToOne_2_1, XmlOneToOne_2_2, XmlOneToOne_2_4, XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch { /** * The cached value of the '{@link #getBatchFetch() Batch Fetch}' containment reference. @@ -216,6 +220,16 @@ protected boolean nonCacheable = NON_CACHEABLE_EDEFAULT; /** + * The cached value of the '{@link #getJoinFields() Join Fields}' containment reference list. + * + * + * @see #getJoinFields() + * @generated + * @ordered + */ + protected EList joinFields; + + /** * The cached value of the '{@link #getAccessMethods() Access Methods}' containment reference. * * @@ -958,6 +972,29 @@ } /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne_2_4_JoinFields() + * @model containment="true" + * @generated + */ + public EList getJoinFields() + { + if (joinFields == null) + { + joinFields = new EObjectContainmentEList(XmlJoinField_2_4.class, this, EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS); + } + return joinFields; + } + + /** * Returns the value of the 'Private Owned' attribute. * *

@@ -1176,6 +1213,8 @@ return basicSetHashPartitioning(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING: return basicSetUnionPartitioning(null, msgs); + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS: + return ((InternalEList)getJoinFields()).basicRemove(otherEnd, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return basicSetAccessMethods(null, msgs); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: @@ -1218,6 +1257,8 @@ return getCascadeOnDelete(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE: return isNonCacheable(); + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS: + return getJoinFields(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return getAccessMethods(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: @@ -1279,6 +1320,10 @@ case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE: setNonCacheable((Boolean)newValue); return; + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS: + getJoinFields().clear(); + getJoinFields().addAll((Collection)newValue); + return; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)newValue); return; @@ -1345,6 +1390,9 @@ case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE: setNonCacheable(NON_CACHEABLE_EDEFAULT); return; + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS: + getJoinFields().clear(); + return; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: setAccessMethods((XmlAccessMethods)null); return; @@ -1398,6 +1446,8 @@ return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE: return nonCacheable != NON_CACHEABLE_EDEFAULT; + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS: + return joinFields != null && !joinFields.isEmpty(); case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return accessMethods != null; case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: @@ -1460,6 +1510,14 @@ default: return -1; } } + if (baseClass == XmlOneToOne_2_4.class) + { + switch (derivedFeatureID) + { + case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS: return EclipseLinkOrmV2_4Package.XML_ONE_TO_ONE_24__JOIN_FIELDS; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (derivedFeatureID) @@ -1551,6 +1609,14 @@ default: return -1; } } + if (baseClass == XmlOneToOne_2_4.class) + { + switch (baseFeatureID) + { + case EclipseLinkOrmV2_4Package.XML_ONE_TO_ONE_24__JOIN_FIELDS: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FIELDS; + default: return -1; + } + } if (baseClass == XmlAccessMethodsHolder.class) { switch (baseFeatureID) @@ -1659,6 +1725,7 @@ buildPrimaryKeyJoinColumnTranslator(), buildJoinColumnTranslator(), buildJoinTableTranslator(), + buildJoinFieldTranslator(), buildCascadeTranslator(), buildCascadeOnDeleteTranslator(), buildPrivateOwnedTranslator(), @@ -1714,4 +1781,8 @@ protected static Translator buildPartitionedTranslator() { return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned()); } + + protected static Translator buildJoinFieldTranslator() { + return XmlJoinField.buildTranslator(EclipseLink2_4.JOIN_FIELD, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlOneToOne_2_4_JoinFields()); + } } Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,300 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; + +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.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; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4; +import org.eclipse.wst.common.internal.emf.resource.Translator; + +/** + * + * A representation of the model object 'Xml Tenant Table Discriminator'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantTableDiscriminator() + * @model kind="class" + * @generated + */ +public class XmlTenantTableDiscriminator extends AbstractJpaEObject implements XmlTenantTableDiscriminator_2_4 +{ + /** + * The default value of the '{@link #getContextProperty() Context Property}' attribute. + * + * + * @see #getContextProperty() + * @generated + * @ordered + */ + protected static final String CONTEXT_PROPERTY_EDEFAULT = null; + + /** + * The cached value of the '{@link #getContextProperty() Context Property}' attribute. + * + * + * @see #getContextProperty() + * @generated + * @ordered + */ + protected String contextProperty = CONTEXT_PROPERTY_EDEFAULT; + + /** + * The default value of the '{@link #getType() Type}' attribute. + * + * + * @see #getType() + * @generated + * @ordered + */ + protected static final TenantTableDiscriminatorType TYPE_EDEFAULT = TenantTableDiscriminatorType.SCHEMA; + + /** + * The cached value of the '{@link #getType() Type}' attribute. + * + * + * @see #getType() + * @generated + * @ordered + */ + protected TenantTableDiscriminatorType type = TYPE_EDEFAULT; + + /** + * + * + * @generated + */ + protected XmlTenantTableDiscriminator() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_TENANT_TABLE_DISCRIMINATOR; + } + + /** + * Returns the value of the 'Context Property' attribute. + * + *

+ * If the meaning of the 'Context Property' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Context Property' attribute. + * @see #setContextProperty(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantTableDiscriminator_2_4_ContextProperty() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getContextProperty() + { + return contextProperty; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator#getContextProperty Context Property}' attribute. + * + * + * @param value the new value of the 'Context Property' attribute. + * @see #getContextProperty() + * @generated + */ + public void setContextProperty(String newContextProperty) + { + String oldContextProperty = contextProperty; + contextProperty = newContextProperty; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY, oldContextProperty, contextProperty)); + } + + /** + * Returns the value of the 'Type' attribute. + * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType}. + * + *

+ * If the meaning of the 'Type' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Type' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @see #setType(TenantTableDiscriminatorType) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantTableDiscriminator_2_4_Type() + * @model + * @generated + */ + public TenantTableDiscriminatorType getType() + { + return type; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantTableDiscriminator#getType Type}' attribute. + * + * + * @param value the new value of the 'Type' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @see #getType() + * @generated + */ + public void setType(TenantTableDiscriminatorType newType) + { + TenantTableDiscriminatorType oldType = type; + type = newType == null ? TYPE_EDEFAULT : newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__TYPE, oldType, type)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY: + return getContextProperty(); + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__TYPE: + return getType(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY: + setContextProperty((String)newValue); + return; + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__TYPE: + setType((TenantTableDiscriminatorType)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY: + setContextProperty(CONTEXT_PROPERTY_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__TYPE: + setType(TYPE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY: + return CONTEXT_PROPERTY_EDEFAULT == null ? contextProperty != null : !CONTEXT_PROPERTY_EDEFAULT.equals(contextProperty); + case EclipseLinkOrmPackage.XML_TENANT_TABLE_DISCRIMINATOR__TYPE: + return type != TYPE_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (contextProperty: "); + result.append(contextProperty); + result.append(", type: "); + result.append(type); + result.append(')'); + return result.toString(); + } + + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + EclipseLinkOrmPackage.eINSTANCE.getXmlTenantTableDiscriminator(), + buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildContextPropertyTranslator(), + buildReferencedFieldNameTranslator(), + }; + } + + protected static Translator buildContextPropertyTranslator() { + return new Translator(EclipseLink2_4.TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlTenantTableDiscriminator_2_4_ContextProperty(), Translator.DOM_ATTRIBUTE); + } + + protected static Translator buildReferencedFieldNameTranslator() { + return new Translator(EclipseLink2_4.TENANT_TABLE_DISCRIMINATOR__TYPE, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlTenantTableDiscriminator_2_4_Type(), Translator.DOM_ATTRIBUTE); + } +} // XmlTenantTableDiscriminator Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUuidGenerator.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,445 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm; + +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.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; + +/** + * + * A representation of the model object 'Xml Uuid Generator'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUuidGenerator() + * @model kind="class" + * @generated + */ +public class XmlUuidGenerator extends AbstractJpaEObject implements XmlUuidGenerator_2_4 +{ + /** + * The default value of the '{@link #getDescription() Description}' attribute. + * + * + * @see #getDescription() + * @generated + * @ordered + */ + protected static final String DESCRIPTION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDescription() Description}' attribute. + * + * + * @see #getDescription() + * @generated + * @ordered + */ + protected String description = DESCRIPTION_EDEFAULT; + + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getInitialValue() Initial Value}' attribute. + * + * + * @see #getInitialValue() + * @generated + * @ordered + */ + protected static final Integer INITIAL_VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getInitialValue() Initial Value}' attribute. + * + * + * @see #getInitialValue() + * @generated + * @ordered + */ + protected Integer initialValue = INITIAL_VALUE_EDEFAULT; + + /** + * The default value of the '{@link #getAllocationSize() Allocation Size}' attribute. + * + * + * @see #getAllocationSize() + * @generated + * @ordered + */ + protected static final Integer ALLOCATION_SIZE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAllocationSize() Allocation Size}' attribute. + * + * + * @see #getAllocationSize() + * @generated + * @ordered + */ + protected Integer allocationSize = ALLOCATION_SIZE_EDEFAULT; + + /** + * + * + * @generated + */ + protected XmlUuidGenerator() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return EclipseLinkOrmPackage.Literals.XML_UUID_GENERATOR; + } + + /** + * Returns the value of the 'Description' attribute. + * + *

+ * If the meaning of the 'Description' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Description' attribute. + * @see #setDescription(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGenerator_2_0_Description() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + public String getDescription() + { + return description; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator#getDescription Description}' attribute. + * + * + * @param value the new value of the 'Description' attribute. + * @see #getDescription() + * @generated + */ + public void setDescription(String newDescription) + { + String oldDescription = description; + description = newDescription; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_UUID_GENERATOR__DESCRIPTION, oldDescription, description)); + } + + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGenerator_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * @generated + */ + public String getName() + { + return name; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + public void setName(String newName) + { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_UUID_GENERATOR__NAME, oldName, name)); + } + + /** + * Returns the value of the 'Initial Value' attribute. + * + *

+ * If the meaning of the 'Initial Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Initial Value' attribute. + * @see #setInitialValue(Integer) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGenerator_InitialValue() + * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" + * @generated + */ + public Integer getInitialValue() + { + return initialValue; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator#getInitialValue Initial Value}' attribute. + * + * + * @param value the new value of the 'Initial Value' attribute. + * @see #getInitialValue() + * @generated + */ + public void setInitialValue(Integer newInitialValue) + { + Integer oldInitialValue = initialValue; + initialValue = newInitialValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_UUID_GENERATOR__INITIAL_VALUE, oldInitialValue, initialValue)); + } + + /** + * Returns the value of the 'Allocation Size' attribute. + * + *

+ * If the meaning of the 'Allocation Size' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Allocation Size' attribute. + * @see #setAllocationSize(Integer) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGenerator_AllocationSize() + * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" + * @generated + */ + public Integer getAllocationSize() + { + return allocationSize; + } + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUuidGenerator#getAllocationSize Allocation Size}' attribute. + * + * + * @param value the new value of the 'Allocation Size' attribute. + * @see #getAllocationSize() + * @generated + */ + public void setAllocationSize(Integer newAllocationSize) + { + Integer oldAllocationSize = allocationSize; + allocationSize = newAllocationSize; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_UUID_GENERATOR__ALLOCATION_SIZE, oldAllocationSize, allocationSize)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__DESCRIPTION: + return getDescription(); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__NAME: + return getName(); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__INITIAL_VALUE: + return getInitialValue(); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__ALLOCATION_SIZE: + return getAllocationSize(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__DESCRIPTION: + setDescription((String)newValue); + return; + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__NAME: + setName((String)newValue); + return; + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__INITIAL_VALUE: + setInitialValue((Integer)newValue); + return; + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__ALLOCATION_SIZE: + setAllocationSize((Integer)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__DESCRIPTION: + setDescription(DESCRIPTION_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__NAME: + setName(NAME_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__INITIAL_VALUE: + setInitialValue(INITIAL_VALUE_EDEFAULT); + return; + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__ALLOCATION_SIZE: + setAllocationSize(ALLOCATION_SIZE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__DESCRIPTION: + return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__INITIAL_VALUE: + return INITIAL_VALUE_EDEFAULT == null ? initialValue != null : !INITIAL_VALUE_EDEFAULT.equals(initialValue); + case EclipseLinkOrmPackage.XML_UUID_GENERATOR__ALLOCATION_SIZE: + return ALLOCATION_SIZE_EDEFAULT == null ? allocationSize != null : !ALLOCATION_SIZE_EDEFAULT.equals(allocationSize); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (description: "); + result.append(description); + result.append(", name: "); + result.append(name); + result.append(", initialValue: "); + result.append(initialValue); + result.append(", allocationSize: "); + result.append(allocationSize); + result.append(')'); + return result.toString(); + } + + public TextRange getNameTextRange() { + return getAttributeTextRange(JPA.NAME); + } + + //TODO remove these methods after refactoring XmlGenerator + public TextRange getSchemaCodeAssistTextRange() { + throw new UnsupportedOperationException(); + } + public TextRange getCatalogCodeAssistTextRange() { + throw new UnsupportedOperationException(); + } + public boolean schemaTouches(int pos) { + throw new UnsupportedOperationException(); + } + + public boolean catalogTouches(int pos) { + throw new UnsupportedOperationException(); + } + + // ********** translators ********** + + public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) { + return new SimpleTranslator( + elementName, + structuralFeature, + EclipseLinkOrmPackage.eINSTANCE.getXmlUuidGenerator(), + buildTranslatorChildren()); + } + + private static Translator[] buildTranslatorChildren() { + return new Translator[] { + buildNameTranslator(), + }; + } + + protected static Translator buildNameTranslator() { + return new Translator(JPA.NAME, OrmPackage.eINSTANCE.getXmlGenerator_Name(), Translator.DOM_ATTRIBUTE); + } + +} // XmlUuidGenerator Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/DataFormatType.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,263 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.emf.common.util.Enumerator; + +/** + * + * A representation of the literals of the enumeration 'Data Format Type', + * and utility methods for working with them. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getDataFormatType() + * @model + * @generated + */ +public enum DataFormatType implements Enumerator +{ + /** + * The 'XML' literal object. + * + * + * @see #XML_VALUE + * @generated + * @ordered + */ + XML(0, "XML", "XML"), + + /** + * The 'INDEXED' literal object. + * + * + * @see #INDEXED_VALUE + * @generated + * @ordered + */ + INDEXED(1, "INDEXED", "INDEXED"), + + /** + * The 'MAPPED' literal object. + * + * + * @see #MAPPED_VALUE + * @generated + * @ordered + */ + MAPPED(2, "MAPPED", "MAPPED"); + + /** + * The 'XML' literal value. + * + *

+ * If the meaning of 'XML' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #XML + * @model + * @generated + * @ordered + */ + public static final int XML_VALUE = 0; + + /** + * The 'INDEXED' literal value. + * + *

+ * If the meaning of 'INDEXED' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #INDEXED + * @model + * @generated + * @ordered + */ + public static final int INDEXED_VALUE = 1; + + /** + * The 'MAPPED' literal value. + * + *

+ * If the meaning of 'MAPPED' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #MAPPED + * @model + * @generated + * @ordered + */ + public static final int MAPPED_VALUE = 2; + + /** + * An array of all the 'Data Format Type' enumerators. + * + * + * @generated + */ + private static final DataFormatType[] VALUES_ARRAY = + new DataFormatType[] + { + XML, + INDEXED, + MAPPED, + }; + + /** + * A public read-only list of all the 'Data Format Type' enumerators. + * + * + * @generated + */ + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); + + /** + * Returns the 'Data Format Type' literal with the specified literal value. + * + * + * @generated + */ + public static DataFormatType get(String literal) + { + for (int i = 0; i < VALUES_ARRAY.length; ++i) + { + DataFormatType result = VALUES_ARRAY[i]; + if (result.toString().equals(literal)) + { + return result; + } + } + return null; + } + + /** + * Returns the 'Data Format Type' literal with the specified name. + * + * + * @generated + */ + public static DataFormatType getByName(String name) + { + for (int i = 0; i < VALUES_ARRAY.length; ++i) + { + DataFormatType result = VALUES_ARRAY[i]; + if (result.getName().equals(name)) + { + return result; + } + } + return null; + } + + /** + * Returns the 'Data Format Type' literal with the specified integer value. + * + * + * @generated + */ + public static DataFormatType get(int value) + { + switch (value) + { + case XML_VALUE: return XML; + case INDEXED_VALUE: return INDEXED; + case MAPPED_VALUE: return MAPPED; + } + return null; + } + + /** + * + * + * @generated + */ + private final int value; + + /** + * + * + * @generated + */ + private final String name; + + /** + * + * + * @generated + */ + private final String literal; + + /** + * Only this class can construct instances. + * + * + * @generated + */ + private DataFormatType(int value, String name, String literal) + { + this.value = value; + this.name = name; + this.literal = literal; + } + + /** + * + * + * @generated + */ + public int getValue() + { + return value; + } + + /** + * + * + * @generated + */ + public String getName() + { + return name; + } + + /** + * + * + * @generated + */ + public String getLiteral() + { + return literal; + } + + /** + * Returns the literal value of the enumerator, which is its string representation. + * + * + * @generated + */ + @Override + public String toString() + { + return literal; + } + +} //DataFormatType Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java,v retrieving revision 1.2 diff -u -r1.2 EclipseLink2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java 19 Sep 2011 15:13:50 -0000 1.2 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java 24 May 2012 01:29:06 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -26,7 +26,17 @@ String CACHE_INDEX = "cache-index"; String CACHE_INDEX__COLUMN_NAME = "column-name"; String DELETE_ALL = "delete-all"; + String FIELD = "field"; + String JOIN_FIELD = "join-field"; + String JOIN_FIELD__NAME = "name"; + String JOIN_FIELD__REFERENCED_FIELD_NAME = "referenced-field-name"; String MULTITENANT__INCLUDE_CRITERIA = "include-criteria"; - + String TENANT_TABLE_DISCRIMINATOR = "tenant-table-discriminator"; + String TENANT_TABLE_DISCRIMINATOR__CONTEXT_PROPERTY = "context-property"; + String TENANT_TABLE_DISCRIMINATOR__TYPE = "type"; + String NO_SQL = "no-sql"; + String NO_SQL__DATA_TYPE = "data-type"; + String NO_SQL__DATA_FORMAT = "data-format"; + String UUID_GENERATOR = "uuid-generator"; } \ No newline at end of file Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java,v retrieving revision 1.2 diff -u -r1.2 EclipseLinkOrmV2_4Factory.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java 19 Sep 2011 15:13:50 -0000 1.2 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java 24 May 2012 01:29:06 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -97,6 +97,10 @@ { case EclipseLinkOrmV2_4Package.DATABASE_CHANGE_NOTIFICATION_TYPE: return createDatabaseChangeNotificationTypeFromString(eDataType, initialValue); + case EclipseLinkOrmV2_4Package.TENANT_TABLE_DISCRIMINATOR_TYPE: + return createTenantTableDiscriminatorTypeFromString(eDataType, initialValue); + case EclipseLinkOrmV2_4Package.DATA_FORMAT_TYPE: + return createDataFormatTypeFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -114,6 +118,10 @@ { case EclipseLinkOrmV2_4Package.DATABASE_CHANGE_NOTIFICATION_TYPE: return convertDatabaseChangeNotificationTypeToString(eDataType, instanceValue); + case EclipseLinkOrmV2_4Package.TENANT_TABLE_DISCRIMINATOR_TYPE: + return convertTenantTableDiscriminatorTypeToString(eDataType, instanceValue); + case EclipseLinkOrmV2_4Package.DATA_FORMAT_TYPE: + return convertDataFormatTypeToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -146,6 +154,50 @@ * * @generated */ + public TenantTableDiscriminatorType createTenantTableDiscriminatorTypeFromString(EDataType eDataType, String initialValue) + { + TenantTableDiscriminatorType result = TenantTableDiscriminatorType.get(initialValue); + if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + return result; + } + + /** + * + * + * @generated + */ + public String convertTenantTableDiscriminatorTypeToString(EDataType eDataType, Object instanceValue) + { + return instanceValue == null ? null : instanceValue.toString(); + } + + /** + * + * + * @generated + */ + public DataFormatType createDataFormatTypeFromString(EDataType eDataType, String initialValue) + { + DataFormatType result = DataFormatType.get(initialValue); + if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); + return result; + } + + /** + * + * + * @generated + */ + public String convertDataFormatTypeToString(EDataType eDataType, Object instanceValue) + { + return instanceValue == null ? null : instanceValue.toString(); + } + + /** + * + * + * @generated + */ public EclipseLinkOrmV2_4Package getEclipseLinkOrmV2_4Package() { return (EclipseLinkOrmV2_4Package)getEPackage(); Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java,v retrieving revision 1.2 diff -u -r1.2 EclipseLinkOrmV2_4Package.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java 19 Sep 2011 15:13:50 -0000 1.2 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java 24 May 2012 01:29:06 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -85,6 +85,52 @@ public static final EclipseLinkOrmV2_4Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package.init(); /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4 Xml Generator Container2 4}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlGeneratorContainer2_4() + * @generated + */ + public static final int XML_GENERATOR_CONTAINER2_4 = 3; + + /** + * The feature id for the 'Sequence Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_GENERATOR_CONTAINER2_4__SEQUENCE_GENERATOR = OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR; + + /** + * The feature id for the 'Table Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_GENERATOR_CONTAINER2_4__TABLE_GENERATOR = OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR; + + /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR = OrmPackage.XML_GENERATOR_CONTAINER_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Xml Generator Container2 4' class. + * + * + * @generated + * @ordered + */ + public static final int XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT = OrmPackage.XML_GENERATOR_CONTAINER_FEATURE_COUNT + 1; + + /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 Xml Multitenant 24}' class. * * @@ -92,7 +138,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4() * @generated */ - public static final int XML_MULTITENANT_24 = 7; + public static final int XML_MULTITENANT_24 = 15; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 Xml Element Collection 24}' class. @@ -102,7 +148,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4() * @generated */ - public static final int XML_ELEMENT_COLLECTION_24 = 3; + public static final int XML_ELEMENT_COLLECTION_24 = 4; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 Xml One To Many 24}' class. @@ -112,7 +158,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4() * @generated */ - public static final int XML_ONE_TO_MANY_24 = 8; + public static final int XML_ONE_TO_MANY_24 = 17; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 Xml Entity 24}' class. @@ -122,7 +168,7 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4() * @generated */ - public static final int XML_ENTITY_24 = 4; + public static final int XML_ENTITY_24 = 7; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4 Xml Basic 24}' class. @@ -135,13 +181,49 @@ public static final int XML_BASIC_24 = 0; /** + * The feature id for the 'Sequence Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_BASIC_24__SEQUENCE_GENERATOR = XML_GENERATOR_CONTAINER2_4__SEQUENCE_GENERATOR; + + /** + * The feature id for the 'Table Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_BASIC_24__TABLE_GENERATOR = XML_GENERATOR_CONTAINER2_4__TABLE_GENERATOR; + + /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_BASIC_24__UUID_GENERATOR = XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; + + /** + * The feature id for the 'Field' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_BASIC_24__FIELD = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 0; + + /** * The feature id for the 'Cache Index' containment reference. * * * @generated * @ordered */ - public static final int XML_BASIC_24__CACHE_INDEX = 0; + public static final int XML_BASIC_24__CACHE_INDEX = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 1; /** * The number of structural features of the 'Xml Basic 24' class. @@ -150,7 +232,7 @@ * @generated * @ordered */ - public static final int XML_BASIC_24_FEATURE_COUNT = 1; + public static final int XML_BASIC_24_FEATURE_COUNT = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCache_2_4 Xml Cache 24}' class. @@ -209,13 +291,22 @@ public static final int XML_CACHE_INDEX_24_FEATURE_COUNT = 1; /** + * The feature id for the 'Field' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_ELEMENT_COLLECTION_24__FIELD = 0; + + /** * The feature id for the 'Delete All' attribute. * * * @generated * @ordered */ - public static final int XML_ELEMENT_COLLECTION_24__DELETE_ALL = 0; + public static final int XML_ELEMENT_COLLECTION_24__DELETE_ALL = 1; /** * The number of structural features of the 'Xml Element Collection 24' class. @@ -224,393 +315,1224 @@ * @generated * @ordered */ - public static final int XML_ELEMENT_COLLECTION_24_FEATURE_COUNT = 1; + public static final int XML_ELEMENT_COLLECTION_24_FEATURE_COUNT = 2; /** - * The feature id for the 'Cache Index' containment reference. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4 Xml Embeddable 24}' class. * * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbeddable_2_4() * @generated - * @ordered */ - public static final int XML_ENTITY_24__CACHE_INDEX = 0; + public static final int XML_EMBEDDABLE_24 = 5; /** - * The number of structural features of the 'Xml Entity 24' class. + * The feature id for the 'No Sql' containment reference. * * * @generated * @ordered */ - public static final int XML_ENTITY_24_FEATURE_COUNT = 1; + public static final int XML_EMBEDDABLE_24__NO_SQL = 0; /** - * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 Xml Id 24}' class. + * The number of structural features of the 'Xml Embeddable 24' class. * * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4() * @generated + * @ordered */ - public static final int XML_ID_24 = 5; + public static final int XML_EMBEDDABLE_24_FEATURE_COUNT = 1; /** - * The feature id for the 'Cache Index' containment reference. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4 Xml Embedded 24}' class. * * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbedded_2_4() * @generated - * @ordered */ - public static final int XML_ID_24__CACHE_INDEX = 0; + public static final int XML_EMBEDDED_24 = 6; /** - * The number of structural features of the 'Xml Id 24' class. + * The feature id for the 'Field' containment reference. * * * @generated * @ordered */ - public static final int XML_ID_24_FEATURE_COUNT = 1; + public static final int XML_EMBEDDED_24__FIELD = 0; /** - * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 Xml Mapped Superclass 24}' class. + * The number of structural features of the 'Xml Embedded 24' class. * * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4() * @generated + * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_24 = 6; + public static final int XML_EMBEDDED_24_FEATURE_COUNT = 1; /** - * The feature id for the 'Cache Index' containment reference. + * The feature id for the 'Sequence Generator' containment reference. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_24__CACHE_INDEX = 0; + public static final int XML_ENTITY_24__SEQUENCE_GENERATOR = XML_GENERATOR_CONTAINER2_4__SEQUENCE_GENERATOR; /** - * The number of structural features of the 'Xml Mapped Superclass 24' class. + * The feature id for the 'Table Generator' containment reference. * * * @generated * @ordered */ - public static final int XML_MAPPED_SUPERCLASS_24_FEATURE_COUNT = 1; + public static final int XML_ENTITY_24__TABLE_GENERATOR = XML_GENERATOR_CONTAINER2_4__TABLE_GENERATOR; /** - * The feature id for the 'Include Criteria' attribute. + * The feature id for the 'Uuid Generator' containment reference. * * * @generated * @ordered */ - public static final int XML_MULTITENANT_24__INCLUDE_CRITERIA = 0; + public static final int XML_ENTITY_24__UUID_GENERATOR = XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; /** - * The number of structural features of the 'Xml Multitenant 24' class. + * The feature id for the 'Cache Index' containment reference. * * * @generated * @ordered */ - public static final int XML_MULTITENANT_24_FEATURE_COUNT = 1; + public static final int XML_ENTITY_24__CACHE_INDEX = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 0; /** - * The feature id for the 'Delete All' attribute. + * The feature id for the 'No Sql' containment reference. * * * @generated * @ordered */ - public static final int XML_ONE_TO_MANY_24__DELETE_ALL = 0; + public static final int XML_ENTITY_24__NO_SQL = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Xml One To Many 24' class. + * The number of structural features of the 'Xml Entity 24' class. * * * @generated * @ordered */ - public static final int XML_ONE_TO_MANY_24_FEATURE_COUNT = 1; + public static final int XML_ENTITY_24_FEATURE_COUNT = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DatabaseChangeNotificationType Database Change Notification Type}' enum. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4 Xml Entity Mappings 24}' class. * * - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DatabaseChangeNotificationType - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getDatabaseChangeNotificationType() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntityMappings_2_4() * @generated */ - public static final int DATABASE_CHANGE_NOTIFICATION_TYPE = 9; + public static final int XML_ENTITY_MAPPINGS_24 = 8; /** + * The feature id for the 'Uuid Generators' containment reference list. * * * @generated + * @ordered */ - private EClass xmlMultitenant_2_4EClass = null; + public static final int XML_ENTITY_MAPPINGS_24__UUID_GENERATORS = 0; /** + * The number of structural features of the 'Xml Entity Mappings 24' class. * * * @generated + * @ordered */ - private EClass xmlElementCollection_2_4EClass = null; + public static final int XML_ENTITY_MAPPINGS_24_FEATURE_COUNT = 1; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4 Xml Field 24}' class. * * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlField_2_4() * @generated */ - private EClass xmlOneToMany_2_4EClass = null; + public static final int XML_FIELD_24 = 9; /** + * The feature id for the 'Name' attribute. * * * @generated + * @ordered */ - private EClass xmlEntity_2_4EClass = null; + public static final int XML_FIELD_24__NAME = 0; /** + * The number of structural features of the 'Xml Field 24' class. * * * @generated + * @ordered */ - private EClass xmlBasic_2_4EClass = null; + public static final int XML_FIELD_24_FEATURE_COUNT = 1; /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 Xml Id 24}' class. * * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4() * @generated */ - private EClass xmlCache_2_4EClass = null; + public static final int XML_ID_24 = 10; /** + * The feature id for the 'Sequence Generator' containment reference. * * * @generated + * @ordered */ - private EClass xmlCacheIndex_2_4EClass = null; + public static final int XML_ID_24__SEQUENCE_GENERATOR = XML_GENERATOR_CONTAINER2_4__SEQUENCE_GENERATOR; /** + * The feature id for the 'Table Generator' containment reference. * * * @generated + * @ordered */ - private EClass xmlId_2_4EClass = null; + public static final int XML_ID_24__TABLE_GENERATOR = XML_GENERATOR_CONTAINER2_4__TABLE_GENERATOR; /** + * The feature id for the 'Uuid Generator' containment reference. * * * @generated + * @ordered */ - private EClass xmlMappedSuperclass_2_4EClass = null; + public static final int XML_ID_24__UUID_GENERATOR = XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; /** + * The feature id for the 'Field' containment reference. * * * @generated + * @ordered */ - private EEnum databaseChangeNotificationTypeEEnum = null; + public static final int XML_ID_24__FIELD = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 0; /** - * Creates an instance of the model Package, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - *

Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. + * The feature id for the 'Cache Index' containment reference. * * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#eNS_URI - * @see #init() * @generated + * @ordered */ - private EclipseLinkOrmV2_4Package() - { - super(eNS_URI, EclipseLinkOrmV2_4Factory.eINSTANCE); - } + public static final int XML_ID_24__CACHE_INDEX = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 1; /** + * The number of structural features of the 'Xml Id 24' class. * * * @generated + * @ordered */ - private static boolean isInited = false; + public static final int XML_ID_24_FEATURE_COUNT = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 2; /** - * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * - *

This method is used to initialize {@link EclipseLinkOrmV2_4Package#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4 Xml Join Field 24}' class. * * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlJoinField_2_4() * @generated */ - public static EclipseLinkOrmV2_4Package init() - { - if (isInited) return (EclipseLinkOrmV2_4Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI); - - // Obtain or create and register package - EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_4Package()); - - isInited = true; - - // Initialize simple dependencies - OrmPackage.eINSTANCE.eClass(); - CommonPackage.eINSTANCE.eClass(); - XMLTypePackage.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); - EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE); - EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE); - EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE); - EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE); - EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE); - - // Create package meta-data objects - theEclipseLinkOrmV2_4Package.createPackageContents(); - theEclipseLinkOrmPackage.createPackageContents(); - theEclipseLinkOrmV1_1Package.createPackageContents(); - theEclipseLinkOrmV2_0Package.createPackageContents(); - theEclipseLinkOrmV2_1Package.createPackageContents(); - theEclipseLinkOrmV2_2Package.createPackageContents(); - theEclipseLinkOrmV2_3Package.createPackageContents(); - - // Initialize created meta-data - theEclipseLinkOrmV2_4Package.initializePackageContents(); - theEclipseLinkOrmPackage.initializePackageContents(); - theEclipseLinkOrmV1_1Package.initializePackageContents(); - theEclipseLinkOrmV2_0Package.initializePackageContents(); - theEclipseLinkOrmV2_1Package.initializePackageContents(); - theEclipseLinkOrmV2_2Package.initializePackageContents(); - theEclipseLinkOrmV2_3Package.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theEclipseLinkOrmV2_4Package.freeze(); - - - // Update the registry and return the package - EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_4Package.eNS_URI, theEclipseLinkOrmV2_4Package); - return theEclipseLinkOrmV2_4Package; - } - + public static final int XML_JOIN_FIELD_24 = 11; /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 Xml Multitenant 24}'. + * The feature id for the 'Name' attribute. * * - * @return the meta object for class 'Xml Multitenant 24'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 * @generated + * @ordered */ - public EClass getXmlMultitenant_2_4() - { - return xmlMultitenant_2_4EClass; - } + public static final int XML_JOIN_FIELD_24__NAME = 0; /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria Include Criteria}'. + * The feature id for the 'Referenced Field Name' attribute. * * - * @return the meta object for the attribute 'Include Criteria'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria() - * @see #getXmlMultitenant_2_4() * @generated + * @ordered */ - public EAttribute getXmlMultitenant_2_4_IncludeCriteria() - { - return (EAttribute)xmlMultitenant_2_4EClass.getEStructuralFeatures().get(0); - } + public static final int XML_JOIN_FIELD_24__REFERENCED_FIELD_NAME = 1; /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 Xml Element Collection 24}'. + * The number of structural features of the 'Xml Join Field 24' class. * * - * @return the meta object for class 'Xml Element Collection 24'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 * @generated + * @ordered */ - public EClass getXmlElementCollection_2_4() - { - return xmlElementCollection_2_4EClass; - } - + public static final int XML_JOIN_FIELD_24_FEATURE_COUNT = 2; /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll Delete All}'. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4 Xml Many To Many 24}' class. * * - * @return the meta object for the attribute 'Delete All'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll() - * @see #getXmlElementCollection_2_4() + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToMany_2_4() * @generated */ - public EAttribute getXmlElementCollection_2_4_DeleteAll() - { - return (EAttribute)xmlElementCollection_2_4EClass.getEStructuralFeatures().get(0); - } - + public static final int XML_MANY_TO_MANY_24 = 12; /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 Xml One To Many 24}'. + * The feature id for the 'Join Fields' containment reference list. * * - * @return the meta object for class 'Xml One To Many 24'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 * @generated + * @ordered */ - public EClass getXmlOneToMany_2_4() - { - return xmlOneToMany_2_4EClass; - } - + public static final int XML_MANY_TO_MANY_24__JOIN_FIELDS = 0; /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll Delete All}'. + * The number of structural features of the 'Xml Many To Many 24' class. * * - * @return the meta object for the attribute 'Delete All'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll() - * @see #getXmlOneToMany_2_4() * @generated + * @ordered */ - public EAttribute getXmlOneToMany_2_4_DeleteAll() - { - return (EAttribute)xmlOneToMany_2_4EClass.getEStructuralFeatures().get(0); - } - + public static final int XML_MANY_TO_MANY_24_FEATURE_COUNT = 1; /** - * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 Xml Entity 24}'. + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4 Xml Many To One 24}' class. * * - * @return the meta object for class 'Xml Entity 24'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToOne_2_4() * @generated */ - public EClass getXmlEntity_2_4() - { - return xmlEntity_2_4EClass; - } - + public static final int XML_MANY_TO_ONE_24 = 13; /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex Cache Index}'. + * The feature id for the 'Join Fields' containment reference list. * * - * @return the meta object for the containment reference 'Cache Index'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex() - * @see #getXmlEntity_2_4() + * @generated + * @ordered + */ + public static final int XML_MANY_TO_ONE_24__JOIN_FIELDS = 0; + + /** + * The number of structural features of the 'Xml Many To One 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_MANY_TO_ONE_24_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 Xml Mapped Superclass 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4() + * @generated + */ + public static final int XML_MAPPED_SUPERCLASS_24 = 14; + + /** + * The feature id for the 'Sequence Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS_24__SEQUENCE_GENERATOR = XML_GENERATOR_CONTAINER2_4__SEQUENCE_GENERATOR; + + /** + * The feature id for the 'Table Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS_24__TABLE_GENERATOR = XML_GENERATOR_CONTAINER2_4__TABLE_GENERATOR; + + /** + * The feature id for the 'Uuid Generator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS_24__UUID_GENERATOR = XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR; + + /** + * The feature id for the 'Cache Index' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS_24__CACHE_INDEX = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Xml Mapped Superclass 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_MAPPED_SUPERCLASS_24_FEATURE_COUNT = XML_GENERATOR_CONTAINER2_4_FEATURE_COUNT + 1; + + /** + * The feature id for the 'Include Criteria' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_MULTITENANT_24__INCLUDE_CRITERIA = 0; + + /** + * The feature id for the 'Tenant Table Discriminator' containment reference. + * + * + * @generated + * @ordered + */ + public static final int XML_MULTITENANT_24__TENANT_TABLE_DISCRIMINATOR = 1; + + /** + * The number of structural features of the 'Xml Multitenant 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_MULTITENANT_24_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4 Xml No Sql 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlNoSql_2_4() + * @generated + */ + public static final int XML_NO_SQL_24 = 16; + + /** + * The feature id for the 'Data Type' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NO_SQL_24__DATA_TYPE = 0; + + /** + * The feature id for the 'Data Format' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_NO_SQL_24__DATA_FORMAT = 1; + + /** + * The number of structural features of the 'Xml No Sql 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_NO_SQL_24_FEATURE_COUNT = 2; + + /** + * The feature id for the 'Join Fields' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY_24__JOIN_FIELDS = 0; + + /** + * The feature id for the 'Delete All' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY_24__DELETE_ALL = 1; + + /** + * The number of structural features of the 'Xml One To Many 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_MANY_24_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4 Xml One To One 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToOne_2_4() + * @generated + */ + public static final int XML_ONE_TO_ONE_24 = 18; + + /** + * The feature id for the 'Join Fields' containment reference list. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_ONE_24__JOIN_FIELDS = 0; + + /** + * The number of structural features of the 'Xml One To One 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_ONE_TO_ONE_24_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4 Xml Tenant Table Discriminator 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlTenantTableDiscriminator_2_4() + * @generated + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR_24 = 19; + + /** + * The feature id for the 'Context Property' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR_24__CONTEXT_PROPERTY = 0; + + /** + * The feature id for the 'Type' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR_24__TYPE = 1; + + /** + * The number of structural features of the 'Xml Tenant Table Discriminator 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_TENANT_TABLE_DISCRIMINATOR_24_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4 Xml Uuid Generator 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlUuidGenerator_2_4() + * @generated + */ + public static final int XML_UUID_GENERATOR_24 = 20; + + /** + * The feature id for the 'Description' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR_24__DESCRIPTION = OrmPackage.XML_GENERATOR__DESCRIPTION; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR_24__NAME = OrmPackage.XML_GENERATOR__NAME; + + /** + * The feature id for the 'Initial Value' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR_24__INITIAL_VALUE = OrmPackage.XML_GENERATOR__INITIAL_VALUE; + + /** + * The feature id for the 'Allocation Size' attribute. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR_24__ALLOCATION_SIZE = OrmPackage.XML_GENERATOR__ALLOCATION_SIZE; + + /** + * The number of structural features of the 'Xml Uuid Generator 24' class. + * + * + * @generated + * @ordered + */ + public static final int XML_UUID_GENERATOR_24_FEATURE_COUNT = OrmPackage.XML_GENERATOR_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DatabaseChangeNotificationType Database Change Notification Type}' enum. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DatabaseChangeNotificationType + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getDatabaseChangeNotificationType() + * @generated + */ + public static final int DATABASE_CHANGE_NOTIFICATION_TYPE = 21; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType Tenant Table Discriminator Type}' enum. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getTenantTableDiscriminatorType() + * @generated + */ + public static final int TENANT_TABLE_DISCRIMINATOR_TYPE = 22; + + /** + * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType Data Format Type}' enum. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getDataFormatType() + * @generated + */ + public static final int DATA_FORMAT_TYPE = 23; + + /** + * + * + * @generated + */ + private EClass xmlMultitenant_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlNoSql_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlElementCollection_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlEmbeddable_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlEmbedded_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlOneToMany_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlOneToOne_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlTenantTableDiscriminator_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlUuidGenerator_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlEntity_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlEntityMappings_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlField_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlBasic_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlCache_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlCacheIndex_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlGeneratorContainer2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlId_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlJoinField_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlManyToMany_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlManyToOne_2_4EClass = null; + + /** + * + * + * @generated + */ + private EClass xmlMappedSuperclass_2_4EClass = null; + + /** + * + * + * @generated + */ + private EEnum databaseChangeNotificationTypeEEnum = null; + + /** + * + * + * @generated + */ + private EEnum tenantTableDiscriminatorTypeEEnum = null; + + /** + * + * + * @generated + */ + private EEnum dataFormatTypeEEnum = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + *

Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + * + * + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#eNS_URI + * @see #init() + * @generated + */ + private EclipseLinkOrmV2_4Package() + { + super(eNS_URI, EclipseLinkOrmV2_4Factory.eINSTANCE); + } + + /** + * + * + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. + * + *

This method is used to initialize {@link EclipseLinkOrmV2_4Package#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * + * + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static EclipseLinkOrmV2_4Package init() + { + if (isInited) return (EclipseLinkOrmV2_4Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI); + + // Obtain or create and register package + EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_4Package()); + + isInited = true; + + // Initialize simple dependencies + OrmPackage.eINSTANCE.eClass(); + CommonPackage.eINSTANCE.eClass(); + XMLTypePackage.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); + EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE); + EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE); + EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE); + EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE); + EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE); + + // Create package meta-data objects + theEclipseLinkOrmV2_4Package.createPackageContents(); + theEclipseLinkOrmPackage.createPackageContents(); + theEclipseLinkOrmV1_1Package.createPackageContents(); + theEclipseLinkOrmV2_0Package.createPackageContents(); + theEclipseLinkOrmV2_1Package.createPackageContents(); + theEclipseLinkOrmV2_2Package.createPackageContents(); + theEclipseLinkOrmV2_3Package.createPackageContents(); + + // Initialize created meta-data + theEclipseLinkOrmV2_4Package.initializePackageContents(); + theEclipseLinkOrmPackage.initializePackageContents(); + theEclipseLinkOrmV1_1Package.initializePackageContents(); + theEclipseLinkOrmV2_0Package.initializePackageContents(); + theEclipseLinkOrmV2_1Package.initializePackageContents(); + theEclipseLinkOrmV2_2Package.initializePackageContents(); + theEclipseLinkOrmV2_3Package.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theEclipseLinkOrmV2_4Package.freeze(); + + + // Update the registry and return the package + EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_4Package.eNS_URI, theEclipseLinkOrmV2_4Package); + return theEclipseLinkOrmV2_4Package; + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 Xml Multitenant 24}'. + * + * + * @return the meta object for class 'Xml Multitenant 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 + * @generated + */ + public EClass getXmlMultitenant_2_4() + { + return xmlMultitenant_2_4EClass; + } + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria Include Criteria}'. + * + * + * @return the meta object for the attribute 'Include Criteria'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria() + * @see #getXmlMultitenant_2_4() + * @generated + */ + public EAttribute getXmlMultitenant_2_4_IncludeCriteria() + { + return (EAttribute)xmlMultitenant_2_4EClass.getEStructuralFeatures().get(0); + } + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getTenantTableDiscriminator Tenant Table Discriminator}'. + * + * + * @return the meta object for the containment reference 'Tenant Table Discriminator'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getTenantTableDiscriminator() + * @see #getXmlMultitenant_2_4() + * @generated + */ + public EReference getXmlMultitenant_2_4_TenantTableDiscriminator() + { + return (EReference)xmlMultitenant_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4 Xml No Sql 24}'. + * + * + * @return the meta object for class 'Xml No Sql 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4 + * @generated + */ + public EClass getXmlNoSql_2_4() + { + return xmlNoSql_2_4EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataType Data Type}'. + * + * + * @return the meta object for the attribute 'Data Type'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataType() + * @see #getXmlNoSql_2_4() + * @generated + */ + public EAttribute getXmlNoSql_2_4_DataType() + { + return (EAttribute)xmlNoSql_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataFormat Data Format}'. + * + * + * @return the meta object for the attribute 'Data Format'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataFormat() + * @see #getXmlNoSql_2_4() + * @generated + */ + public EAttribute getXmlNoSql_2_4_DataFormat() + { + return (EAttribute)xmlNoSql_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 Xml Element Collection 24}'. + * + * + * @return the meta object for class 'Xml Element Collection 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 + * @generated + */ + public EClass getXmlElementCollection_2_4() + { + return xmlElementCollection_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#getField Field}'. + * + * + * @return the meta object for the containment reference 'Field'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#getField() + * @see #getXmlElementCollection_2_4() + * @generated + */ + public EReference getXmlElementCollection_2_4_Field() + { + return (EReference)xmlElementCollection_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll Delete All}'. + * + * + * @return the meta object for the attribute 'Delete All'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll() + * @see #getXmlElementCollection_2_4() + * @generated + */ + public EAttribute getXmlElementCollection_2_4_DeleteAll() + { + return (EAttribute)xmlElementCollection_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4 Xml Embeddable 24}'. + * + * + * @return the meta object for class 'Xml Embeddable 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4 + * @generated + */ + public EClass getXmlEmbeddable_2_4() + { + return xmlEmbeddable_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4#getNoSql No Sql}'. + * + * + * @return the meta object for the containment reference 'No Sql'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4#getNoSql() + * @see #getXmlEmbeddable_2_4() + * @generated + */ + public EReference getXmlEmbeddable_2_4_NoSql() + { + return (EReference)xmlEmbeddable_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4 Xml Embedded 24}'. + * + * + * @return the meta object for class 'Xml Embedded 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4 + * @generated + */ + public EClass getXmlEmbedded_2_4() + { + return xmlEmbedded_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4#getField Field}'. + * + * + * @return the meta object for the containment reference 'Field'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4#getField() + * @see #getXmlEmbedded_2_4() + * @generated + */ + public EReference getXmlEmbedded_2_4_Field() + { + return (EReference)xmlEmbedded_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 Xml One To Many 24}'. + * + * + * @return the meta object for class 'Xml One To Many 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 + * @generated + */ + public EClass getXmlOneToMany_2_4() + { + return xmlOneToMany_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#getJoinFields Join Fields}'. + * + * + * @return the meta object for the containment reference list 'Join Fields'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#getJoinFields() + * @see #getXmlOneToMany_2_4() + * @generated + */ + public EReference getXmlOneToMany_2_4_JoinFields() + { + return (EReference)xmlOneToMany_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll Delete All}'. + * + * + * @return the meta object for the attribute 'Delete All'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll() + * @see #getXmlOneToMany_2_4() + * @generated + */ + public EAttribute getXmlOneToMany_2_4_DeleteAll() + { + return (EAttribute)xmlOneToMany_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4 Xml One To One 24}'. + * + * + * @return the meta object for class 'Xml One To One 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4 + * @generated + */ + public EClass getXmlOneToOne_2_4() + { + return xmlOneToOne_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4#getJoinFields Join Fields}'. + * + * + * @return the meta object for the containment reference list 'Join Fields'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4#getJoinFields() + * @see #getXmlOneToOne_2_4() + * @generated + */ + public EReference getXmlOneToOne_2_4_JoinFields() + { + return (EReference)xmlOneToOne_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4 Xml Tenant Table Discriminator 24}'. + * + * + * @return the meta object for class 'Xml Tenant Table Discriminator 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4 + * @generated + */ + public EClass getXmlTenantTableDiscriminator_2_4() + { + return xmlTenantTableDiscriminator_2_4EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getContextProperty Context Property}'. + * + * + * @return the meta object for the attribute 'Context Property'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getContextProperty() + * @see #getXmlTenantTableDiscriminator_2_4() + * @generated + */ + public EAttribute getXmlTenantTableDiscriminator_2_4_ContextProperty() + { + return (EAttribute)xmlTenantTableDiscriminator_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getType Type}'. + * + * + * @return the meta object for the attribute 'Type'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getType() + * @see #getXmlTenantTableDiscriminator_2_4() + * @generated + */ + public EAttribute getXmlTenantTableDiscriminator_2_4_Type() + { + return (EAttribute)xmlTenantTableDiscriminator_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4 Xml Uuid Generator 24}'. + * + * + * @return the meta object for class 'Xml Uuid Generator 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4 + * @generated + */ + public EClass getXmlUuidGenerator_2_4() + { + return xmlUuidGenerator_2_4EClass; + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 Xml Entity 24}'. + * + * + * @return the meta object for class 'Xml Entity 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 + * @generated + */ + public EClass getXmlEntity_2_4() + { + return xmlEntity_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex Cache Index}'. + * + * + * @return the meta object for the containment reference 'Cache Index'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex() + * @see #getXmlEntity_2_4() * @generated */ public EReference getXmlEntity_2_4_CacheIndex() @@ -620,6 +1542,79 @@ /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getNoSql No Sql}'. + * + * + * @return the meta object for the containment reference 'No Sql'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getNoSql() + * @see #getXmlEntity_2_4() + * @generated + */ + public EReference getXmlEntity_2_4_NoSql() + { + return (EReference)xmlEntity_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4 Xml Entity Mappings 24}'. + * + * + * @return the meta object for class 'Xml Entity Mappings 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4 + * @generated + */ + public EClass getXmlEntityMappings_2_4() + { + return xmlEntityMappings_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4#getUuidGenerators Uuid Generators}'. + * + * + * @return the meta object for the containment reference list 'Uuid Generators'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4#getUuidGenerators() + * @see #getXmlEntityMappings_2_4() + * @generated + */ + public EReference getXmlEntityMappings_2_4_UuidGenerators() + { + return (EReference)xmlEntityMappings_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4 Xml Field 24}'. + * + * + * @return the meta object for class 'Xml Field 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4 + * @generated + */ + public EClass getXmlField_2_4() + { + return xmlField_2_4EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4#getName() + * @see #getXmlField_2_4() + * @generated + */ + public EAttribute getXmlField_2_4_Name() + { + return (EAttribute)xmlField_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4 Xml Basic 24}'. * * @@ -634,6 +1629,21 @@ /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getField Field}'. + * + * + * @return the meta object for the containment reference 'Field'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getField() + * @see #getXmlBasic_2_4() + * @generated + */ + public EReference getXmlBasic_2_4_Field() + { + return (EReference)xmlBasic_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex Cache Index}'. * * @@ -644,7 +1654,7 @@ */ public EReference getXmlBasic_2_4_CacheIndex() { - return (EReference)xmlBasic_2_4EClass.getEStructuralFeatures().get(0); + return (EReference)xmlBasic_2_4EClass.getEStructuralFeatures().get(1); } @@ -707,6 +1717,35 @@ /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4 Xml Generator Container2 4}'. + * + * + * @return the meta object for class 'Xml Generator Container2 4'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4 + * @generated + */ + public EClass getXmlGeneratorContainer2_4() + { + return xmlGeneratorContainer2_4EClass; + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4#getUuidGenerator Uuid Generator}'. + * + * + * @return the meta object for the containment reference 'Uuid Generator'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4#getUuidGenerator() + * @see #getXmlGeneratorContainer2_4() + * @generated + */ + public EReference getXmlGeneratorContainer2_4_UuidGenerator() + { + return (EReference)xmlGeneratorContainer2_4EClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 Xml Id 24}'. * * @@ -714,24 +1753,141 @@ * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 * @generated */ - public EClass getXmlId_2_4() + public EClass getXmlId_2_4() + { + return xmlId_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getField Field}'. + * + * + * @return the meta object for the containment reference 'Field'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getField() + * @see #getXmlId_2_4() + * @generated + */ + public EReference getXmlId_2_4_Field() + { + return (EReference)xmlId_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex Cache Index}'. + * + * + * @return the meta object for the containment reference 'Cache Index'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex() + * @see #getXmlId_2_4() + * @generated + */ + public EReference getXmlId_2_4_CacheIndex() + { + return (EReference)xmlId_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4 Xml Join Field 24}'. + * + * + * @return the meta object for class 'Xml Join Field 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4 + * @generated + */ + public EClass getXmlJoinField_2_4() + { + return xmlJoinField_2_4EClass; + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getName() + * @see #getXmlJoinField_2_4() + * @generated + */ + public EAttribute getXmlJoinField_2_4_Name() + { + return (EAttribute)xmlJoinField_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getReferencedFieldName Referenced Field Name}'. + * + * + * @return the meta object for the attribute 'Referenced Field Name'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getReferencedFieldName() + * @see #getXmlJoinField_2_4() + * @generated + */ + public EAttribute getXmlJoinField_2_4_ReferencedFieldName() + { + return (EAttribute)xmlJoinField_2_4EClass.getEStructuralFeatures().get(1); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4 Xml Many To Many 24}'. + * + * + * @return the meta object for class 'Xml Many To Many 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4 + * @generated + */ + public EClass getXmlManyToMany_2_4() + { + return xmlManyToMany_2_4EClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4#getJoinFields Join Fields}'. + * + * + * @return the meta object for the containment reference list 'Join Fields'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4#getJoinFields() + * @see #getXmlManyToMany_2_4() + * @generated + */ + public EReference getXmlManyToMany_2_4_JoinFields() + { + return (EReference)xmlManyToMany_2_4EClass.getEStructuralFeatures().get(0); + } + + + /** + * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4 Xml Many To One 24}'. + * + * + * @return the meta object for class 'Xml Many To One 24'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4 + * @generated + */ + public EClass getXmlManyToOne_2_4() { - return xmlId_2_4EClass; + return xmlManyToOne_2_4EClass; } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex Cache Index}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4#getJoinFields Join Fields}'. * * - * @return the meta object for the containment reference 'Cache Index'. - * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex() - * @see #getXmlId_2_4() + * @return the meta object for the containment reference list 'Join Fields'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4#getJoinFields() + * @see #getXmlManyToOne_2_4() * @generated */ - public EReference getXmlId_2_4_CacheIndex() + public EReference getXmlManyToOne_2_4_JoinFields() { - return (EReference)xmlId_2_4EClass.getEStructuralFeatures().get(0); + return (EReference)xmlManyToOne_2_4EClass.getEStructuralFeatures().get(0); } @@ -779,6 +1935,34 @@ /** + * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType Tenant Table Discriminator Type}'. + * + * + * @return the meta object for enum 'Tenant Table Discriminator Type'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @generated + */ + public EEnum getTenantTableDiscriminatorType() + { + return tenantTableDiscriminatorTypeEEnum; + } + + + /** + * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType Data Format Type}'. + * + * + * @return the meta object for enum 'Data Format Type'. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @generated + */ + public EEnum getDataFormatType() + { + return dataFormatTypeEEnum; + } + + + /** * Returns the factory that creates the instances of the model. * * @@ -811,6 +1995,7 @@ // Create classes and their features xmlBasic_2_4EClass = createEClass(XML_BASIC_24); + createEReference(xmlBasic_2_4EClass, XML_BASIC_24__FIELD); createEReference(xmlBasic_2_4EClass, XML_BASIC_24__CACHE_INDEX); xmlCache_2_4EClass = createEClass(XML_CACHE_24); @@ -819,26 +2004,71 @@ xmlCacheIndex_2_4EClass = createEClass(XML_CACHE_INDEX_24); createEAttribute(xmlCacheIndex_2_4EClass, XML_CACHE_INDEX_24__COLUMN_NAMES); + xmlGeneratorContainer2_4EClass = createEClass(XML_GENERATOR_CONTAINER2_4); + createEReference(xmlGeneratorContainer2_4EClass, XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR); + xmlElementCollection_2_4EClass = createEClass(XML_ELEMENT_COLLECTION_24); + createEReference(xmlElementCollection_2_4EClass, XML_ELEMENT_COLLECTION_24__FIELD); createEAttribute(xmlElementCollection_2_4EClass, XML_ELEMENT_COLLECTION_24__DELETE_ALL); + xmlEmbeddable_2_4EClass = createEClass(XML_EMBEDDABLE_24); + createEReference(xmlEmbeddable_2_4EClass, XML_EMBEDDABLE_24__NO_SQL); + + xmlEmbedded_2_4EClass = createEClass(XML_EMBEDDED_24); + createEReference(xmlEmbedded_2_4EClass, XML_EMBEDDED_24__FIELD); + xmlEntity_2_4EClass = createEClass(XML_ENTITY_24); createEReference(xmlEntity_2_4EClass, XML_ENTITY_24__CACHE_INDEX); + createEReference(xmlEntity_2_4EClass, XML_ENTITY_24__NO_SQL); + + xmlEntityMappings_2_4EClass = createEClass(XML_ENTITY_MAPPINGS_24); + createEReference(xmlEntityMappings_2_4EClass, XML_ENTITY_MAPPINGS_24__UUID_GENERATORS); + + xmlField_2_4EClass = createEClass(XML_FIELD_24); + createEAttribute(xmlField_2_4EClass, XML_FIELD_24__NAME); xmlId_2_4EClass = createEClass(XML_ID_24); + createEReference(xmlId_2_4EClass, XML_ID_24__FIELD); createEReference(xmlId_2_4EClass, XML_ID_24__CACHE_INDEX); + xmlJoinField_2_4EClass = createEClass(XML_JOIN_FIELD_24); + createEAttribute(xmlJoinField_2_4EClass, XML_JOIN_FIELD_24__NAME); + createEAttribute(xmlJoinField_2_4EClass, XML_JOIN_FIELD_24__REFERENCED_FIELD_NAME); + + xmlManyToMany_2_4EClass = createEClass(XML_MANY_TO_MANY_24); + createEReference(xmlManyToMany_2_4EClass, XML_MANY_TO_MANY_24__JOIN_FIELDS); + + xmlManyToOne_2_4EClass = createEClass(XML_MANY_TO_ONE_24); + createEReference(xmlManyToOne_2_4EClass, XML_MANY_TO_ONE_24__JOIN_FIELDS); + xmlMappedSuperclass_2_4EClass = createEClass(XML_MAPPED_SUPERCLASS_24); createEReference(xmlMappedSuperclass_2_4EClass, XML_MAPPED_SUPERCLASS_24__CACHE_INDEX); xmlMultitenant_2_4EClass = createEClass(XML_MULTITENANT_24); createEAttribute(xmlMultitenant_2_4EClass, XML_MULTITENANT_24__INCLUDE_CRITERIA); + createEReference(xmlMultitenant_2_4EClass, XML_MULTITENANT_24__TENANT_TABLE_DISCRIMINATOR); + + xmlNoSql_2_4EClass = createEClass(XML_NO_SQL_24); + createEAttribute(xmlNoSql_2_4EClass, XML_NO_SQL_24__DATA_TYPE); + createEAttribute(xmlNoSql_2_4EClass, XML_NO_SQL_24__DATA_FORMAT); xmlOneToMany_2_4EClass = createEClass(XML_ONE_TO_MANY_24); + createEReference(xmlOneToMany_2_4EClass, XML_ONE_TO_MANY_24__JOIN_FIELDS); createEAttribute(xmlOneToMany_2_4EClass, XML_ONE_TO_MANY_24__DELETE_ALL); + xmlOneToOne_2_4EClass = createEClass(XML_ONE_TO_ONE_24); + createEReference(xmlOneToOne_2_4EClass, XML_ONE_TO_ONE_24__JOIN_FIELDS); + + xmlTenantTableDiscriminator_2_4EClass = createEClass(XML_TENANT_TABLE_DISCRIMINATOR_24); + createEAttribute(xmlTenantTableDiscriminator_2_4EClass, XML_TENANT_TABLE_DISCRIMINATOR_24__CONTEXT_PROPERTY); + createEAttribute(xmlTenantTableDiscriminator_2_4EClass, XML_TENANT_TABLE_DISCRIMINATOR_24__TYPE); + + xmlUuidGenerator_2_4EClass = createEClass(XML_UUID_GENERATOR_24); + // Create enums databaseChangeNotificationTypeEEnum = createEEnum(DATABASE_CHANGE_NOTIFICATION_TYPE); + tenantTableDiscriminatorTypeEEnum = createEEnum(TENANT_TABLE_DISCRIMINATOR_TYPE); + dataFormatTypeEEnum = createEEnum(DATA_FORMAT_TYPE); } /** @@ -867,15 +2097,23 @@ // Obtain other dependent packages XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); + OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI); // Create type parameters // Set bounds for type parameters // Add supertypes to classes + xmlBasic_2_4EClass.getESuperTypes().add(this.getXmlGeneratorContainer2_4()); + xmlGeneratorContainer2_4EClass.getESuperTypes().add(theOrmPackage.getXmlGeneratorContainer()); + xmlEntity_2_4EClass.getESuperTypes().add(this.getXmlGeneratorContainer2_4()); + xmlId_2_4EClass.getESuperTypes().add(this.getXmlGeneratorContainer2_4()); + xmlMappedSuperclass_2_4EClass.getESuperTypes().add(this.getXmlGeneratorContainer2_4()); + xmlUuidGenerator_2_4EClass.getESuperTypes().add(theOrmPackage.getXmlGenerator()); // Initialize classes and features; add operations and parameters initEClass(xmlBasic_2_4EClass, XmlBasic_2_4.class, "XmlBasic_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlBasic_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlBasic_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlCache_2_4EClass, XmlCache_2_4.class, "XmlCache_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -884,28 +2122,81 @@ initEClass(xmlCacheIndex_2_4EClass, XmlCacheIndex_2_4.class, "XmlCacheIndex_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlCacheIndex_2_4_ColumnNames(), theXMLTypePackage.getString(), "columnNames", null, 0, -1, XmlCacheIndex_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlGeneratorContainer2_4EClass, XmlGeneratorContainer2_4.class, "XmlGeneratorContainer2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlGeneratorContainer2_4_UuidGenerator(), this.getXmlUuidGenerator_2_4(), null, "uuidGenerator", null, 0, 1, XmlGeneratorContainer2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlElementCollection_2_4EClass, XmlElementCollection_2_4.class, "XmlElementCollection_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlElementCollection_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlElementCollection_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlElementCollection_2_4_DeleteAll(), theXMLTypePackage.getBoolean(), "deleteAll", null, 0, 1, XmlElementCollection_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlEmbeddable_2_4EClass, XmlEmbeddable_2_4.class, "XmlEmbeddable_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlEmbeddable_2_4_NoSql(), this.getXmlNoSql_2_4(), null, "noSql", null, 0, 1, XmlEmbeddable_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlEmbedded_2_4EClass, XmlEmbedded_2_4.class, "XmlEmbedded_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlEmbedded_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlEmbedded_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlEntity_2_4EClass, XmlEntity_2_4.class, "XmlEntity_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlEntity_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlEntity_2_4_NoSql(), this.getXmlNoSql_2_4(), null, "noSql", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlEntityMappings_2_4EClass, XmlEntityMappings_2_4.class, "XmlEntityMappings_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlEntityMappings_2_4_UuidGenerators(), this.getXmlUuidGenerator_2_4(), null, "uuidGenerators", null, 0, -1, XmlEntityMappings_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlField_2_4EClass, XmlField_2_4.class, "XmlField_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlField_2_4_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlField_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlId_2_4EClass, XmlId_2_4.class, "XmlId_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlId_2_4_Field(), this.getXmlField_2_4(), null, "field", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getXmlId_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlJoinField_2_4EClass, XmlJoinField_2_4.class, "XmlJoinField_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlJoinField_2_4_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlJoinField_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlJoinField_2_4_ReferencedFieldName(), theXMLTypePackage.getString(), "referencedFieldName", null, 0, 1, XmlJoinField_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlManyToMany_2_4EClass, XmlManyToMany_2_4.class, "XmlManyToMany_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlManyToMany_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlManyToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlManyToOne_2_4EClass, XmlManyToOne_2_4.class, "XmlManyToOne_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlManyToOne_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlManyToOne_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlMappedSuperclass_2_4EClass, XmlMappedSuperclass_2_4.class, "XmlMappedSuperclass_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getXmlMappedSuperclass_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlMappedSuperclass_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlMultitenant_2_4EClass, XmlMultitenant_2_4.class, "XmlMultitenant_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getXmlMultitenant_2_4_IncludeCriteria(), theXMLTypePackage.getBooleanObject(), "includeCriteria", null, 0, 1, XmlMultitenant_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getXmlMultitenant_2_4_TenantTableDiscriminator(), this.getXmlTenantTableDiscriminator_2_4(), null, "tenantTableDiscriminator", null, 0, 1, XmlMultitenant_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlNoSql_2_4EClass, XmlNoSql_2_4.class, "XmlNoSql_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlNoSql_2_4_DataType(), theXMLTypePackage.getString(), "dataType", null, 0, 1, XmlNoSql_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlNoSql_2_4_DataFormat(), this.getDataFormatType(), "dataFormat", "", 0, 1, XmlNoSql_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(xmlOneToMany_2_4EClass, XmlOneToMany_2_4.class, "XmlOneToMany_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlOneToMany_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlOneToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getXmlOneToMany_2_4_DeleteAll(), theXMLTypePackage.getBoolean(), "deleteAll", null, 0, 1, XmlOneToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(xmlOneToOne_2_4EClass, XmlOneToOne_2_4.class, "XmlOneToOne_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getXmlOneToOne_2_4_JoinFields(), this.getXmlJoinField_2_4(), null, "joinFields", null, 0, -1, XmlOneToOne_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlTenantTableDiscriminator_2_4EClass, XmlTenantTableDiscriminator_2_4.class, "XmlTenantTableDiscriminator_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getXmlTenantTableDiscriminator_2_4_ContextProperty(), theXMLTypePackage.getString(), "contextProperty", null, 0, 1, XmlTenantTableDiscriminator_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getXmlTenantTableDiscriminator_2_4_Type(), this.getTenantTableDiscriminatorType(), "type", null, 0, 1, XmlTenantTableDiscriminator_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(xmlUuidGenerator_2_4EClass, XmlUuidGenerator_2_4.class, "XmlUuidGenerator_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + // Initialize enums and add enum literals initEEnum(databaseChangeNotificationTypeEEnum, DatabaseChangeNotificationType.class, "DatabaseChangeNotificationType"); addEEnumLiteral(databaseChangeNotificationTypeEEnum, DatabaseChangeNotificationType.NONE); addEEnumLiteral(databaseChangeNotificationTypeEEnum, DatabaseChangeNotificationType.INVALIDATION); + + initEEnum(tenantTableDiscriminatorTypeEEnum, TenantTableDiscriminatorType.class, "TenantTableDiscriminatorType"); + addEEnumLiteral(tenantTableDiscriminatorTypeEEnum, TenantTableDiscriminatorType.SCHEMA); + addEEnumLiteral(tenantTableDiscriminatorTypeEEnum, TenantTableDiscriminatorType.SUFFIX); + addEEnumLiteral(tenantTableDiscriminatorTypeEEnum, TenantTableDiscriminatorType.PREFIX); + + initEEnum(dataFormatTypeEEnum, DataFormatType.class, "DataFormatType"); + addEEnumLiteral(dataFormatTypeEEnum, DataFormatType.XML); + addEEnumLiteral(dataFormatTypeEEnum, DataFormatType.INDEXED); + addEEnumLiteral(dataFormatTypeEEnum, DataFormatType.MAPPED); } /** @@ -941,6 +2232,40 @@ public static final EAttribute XML_MULTITENANT_24__INCLUDE_CRITERIA = eINSTANCE.getXmlMultitenant_2_4_IncludeCriteria(); /** + * The meta object literal for the 'Tenant Table Discriminator' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_MULTITENANT_24__TENANT_TABLE_DISCRIMINATOR = eINSTANCE.getXmlMultitenant_2_4_TenantTableDiscriminator(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4 Xml No Sql 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlNoSql_2_4() + * @generated + */ + public static final EClass XML_NO_SQL_24 = eINSTANCE.getXmlNoSql_2_4(); + + /** + * The meta object literal for the 'Data Type' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_NO_SQL_24__DATA_TYPE = eINSTANCE.getXmlNoSql_2_4_DataType(); + + /** + * The meta object literal for the 'Data Format' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_NO_SQL_24__DATA_FORMAT = eINSTANCE.getXmlNoSql_2_4_DataFormat(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 Xml Element Collection 24}' class. * * @@ -951,6 +2276,14 @@ public static final EClass XML_ELEMENT_COLLECTION_24 = eINSTANCE.getXmlElementCollection_2_4(); /** + * The meta object literal for the 'Field' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_ELEMENT_COLLECTION_24__FIELD = eINSTANCE.getXmlElementCollection_2_4_Field(); + + /** * The meta object literal for the 'Delete All' attribute feature. * * @@ -959,6 +2292,42 @@ public static final EAttribute XML_ELEMENT_COLLECTION_24__DELETE_ALL = eINSTANCE.getXmlElementCollection_2_4_DeleteAll(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4 Xml Embeddable 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbeddable_2_4() + * @generated + */ + public static final EClass XML_EMBEDDABLE_24 = eINSTANCE.getXmlEmbeddable_2_4(); + + /** + * The meta object literal for the 'No Sql' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_EMBEDDABLE_24__NO_SQL = eINSTANCE.getXmlEmbeddable_2_4_NoSql(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4 Xml Embedded 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbedded_2_4() + * @generated + */ + public static final EClass XML_EMBEDDED_24 = eINSTANCE.getXmlEmbedded_2_4(); + + /** + * The meta object literal for the 'Field' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_EMBEDDED_24__FIELD = eINSTANCE.getXmlEmbedded_2_4_Field(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 Xml One To Many 24}' class. * * @@ -969,6 +2338,14 @@ public static final EClass XML_ONE_TO_MANY_24 = eINSTANCE.getXmlOneToMany_2_4(); /** + * The meta object literal for the 'Join Fields' containment reference list feature. + * + * + * @generated + */ + public static final EReference XML_ONE_TO_MANY_24__JOIN_FIELDS = eINSTANCE.getXmlOneToMany_2_4_JoinFields(); + + /** * The meta object literal for the 'Delete All' attribute feature. * * @@ -977,6 +2354,60 @@ public static final EAttribute XML_ONE_TO_MANY_24__DELETE_ALL = eINSTANCE.getXmlOneToMany_2_4_DeleteAll(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4 Xml One To One 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToOne_2_4() + * @generated + */ + public static final EClass XML_ONE_TO_ONE_24 = eINSTANCE.getXmlOneToOne_2_4(); + + /** + * The meta object literal for the 'Join Fields' containment reference list feature. + * + * + * @generated + */ + public static final EReference XML_ONE_TO_ONE_24__JOIN_FIELDS = eINSTANCE.getXmlOneToOne_2_4_JoinFields(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4 Xml Tenant Table Discriminator 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlTenantTableDiscriminator_2_4() + * @generated + */ + public static final EClass XML_TENANT_TABLE_DISCRIMINATOR_24 = eINSTANCE.getXmlTenantTableDiscriminator_2_4(); + + /** + * The meta object literal for the 'Context Property' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_TENANT_TABLE_DISCRIMINATOR_24__CONTEXT_PROPERTY = eINSTANCE.getXmlTenantTableDiscriminator_2_4_ContextProperty(); + + /** + * The meta object literal for the 'Type' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_TENANT_TABLE_DISCRIMINATOR_24__TYPE = eINSTANCE.getXmlTenantTableDiscriminator_2_4_Type(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4 Xml Uuid Generator 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlUuidGenerator_2_4() + * @generated + */ + public static final EClass XML_UUID_GENERATOR_24 = eINSTANCE.getXmlUuidGenerator_2_4(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 Xml Entity 24}' class. * * @@ -995,6 +2426,50 @@ public static final EReference XML_ENTITY_24__CACHE_INDEX = eINSTANCE.getXmlEntity_2_4_CacheIndex(); /** + * The meta object literal for the 'No Sql' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_ENTITY_24__NO_SQL = eINSTANCE.getXmlEntity_2_4_NoSql(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4 Xml Entity Mappings 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntityMappings_2_4() + * @generated + */ + public static final EClass XML_ENTITY_MAPPINGS_24 = eINSTANCE.getXmlEntityMappings_2_4(); + + /** + * The meta object literal for the 'Uuid Generators' containment reference list feature. + * + * + * @generated + */ + public static final EReference XML_ENTITY_MAPPINGS_24__UUID_GENERATORS = eINSTANCE.getXmlEntityMappings_2_4_UuidGenerators(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4 Xml Field 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlField_2_4() + * @generated + */ + public static final EClass XML_FIELD_24 = eINSTANCE.getXmlField_2_4(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_FIELD_24__NAME = eINSTANCE.getXmlField_2_4_Name(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4 Xml Basic 24}' class. * * @@ -1005,6 +2480,14 @@ public static final EClass XML_BASIC_24 = eINSTANCE.getXmlBasic_2_4(); /** + * The meta object literal for the 'Field' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_BASIC_24__FIELD = eINSTANCE.getXmlBasic_2_4_Field(); + + /** * The meta object literal for the 'Cache Index' containment reference feature. * * @@ -1049,6 +2532,24 @@ public static final EAttribute XML_CACHE_INDEX_24__COLUMN_NAMES = eINSTANCE.getXmlCacheIndex_2_4_ColumnNames(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4 Xml Generator Container2 4}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlGeneratorContainer2_4() + * @generated + */ + public static final EClass XML_GENERATOR_CONTAINER2_4 = eINSTANCE.getXmlGeneratorContainer2_4(); + + /** + * The meta object literal for the 'Uuid Generator' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_GENERATOR_CONTAINER2_4__UUID_GENERATOR = eINSTANCE.getXmlGeneratorContainer2_4_UuidGenerator(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 Xml Id 24}' class. * * @@ -1059,6 +2560,14 @@ public static final EClass XML_ID_24 = eINSTANCE.getXmlId_2_4(); /** + * The meta object literal for the 'Field' containment reference feature. + * + * + * @generated + */ + public static final EReference XML_ID_24__FIELD = eINSTANCE.getXmlId_2_4_Field(); + + /** * The meta object literal for the 'Cache Index' containment reference feature. * * @@ -1067,6 +2576,68 @@ public static final EReference XML_ID_24__CACHE_INDEX = eINSTANCE.getXmlId_2_4_CacheIndex(); /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4 Xml Join Field 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlJoinField_2_4() + * @generated + */ + public static final EClass XML_JOIN_FIELD_24 = eINSTANCE.getXmlJoinField_2_4(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_JOIN_FIELD_24__NAME = eINSTANCE.getXmlJoinField_2_4_Name(); + + /** + * The meta object literal for the 'Referenced Field Name' attribute feature. + * + * + * @generated + */ + public static final EAttribute XML_JOIN_FIELD_24__REFERENCED_FIELD_NAME = eINSTANCE.getXmlJoinField_2_4_ReferencedFieldName(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4 Xml Many To Many 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToMany_2_4() + * @generated + */ + public static final EClass XML_MANY_TO_MANY_24 = eINSTANCE.getXmlManyToMany_2_4(); + + /** + * The meta object literal for the 'Join Fields' containment reference list feature. + * + * + * @generated + */ + public static final EReference XML_MANY_TO_MANY_24__JOIN_FIELDS = eINSTANCE.getXmlManyToMany_2_4_JoinFields(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4 Xml Many To One 24}' class. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4 + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToOne_2_4() + * @generated + */ + public static final EClass XML_MANY_TO_ONE_24 = eINSTANCE.getXmlManyToOne_2_4(); + + /** + * The meta object literal for the 'Join Fields' containment reference list feature. + * + * + * @generated + */ + public static final EReference XML_MANY_TO_ONE_24__JOIN_FIELDS = eINSTANCE.getXmlManyToOne_2_4_JoinFields(); + + /** * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 Xml Mapped Superclass 24}' class. * * @@ -1094,6 +2665,26 @@ */ public static final EEnum DATABASE_CHANGE_NOTIFICATION_TYPE = eINSTANCE.getDatabaseChangeNotificationType(); + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType Tenant Table Discriminator Type}' enum. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getTenantTableDiscriminatorType() + * @generated + */ + public static final EEnum TENANT_TABLE_DISCRIMINATOR_TYPE = eINSTANCE.getTenantTableDiscriminatorType(); + + /** + * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType Data Format Type}' enum. + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getDataFormatType() + * @generated + */ + public static final EEnum DATA_FORMAT_TYPE = eINSTANCE.getDataFormatType(); + } } //EclipseLinkOrmV2_4Package Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/TenantTableDiscriminatorType.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,263 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.emf.common.util.Enumerator; + +/** + * + * A representation of the literals of the enumeration 'Tenant Table Discriminator Type', + * and utility methods for working with them. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getTenantTableDiscriminatorType() + * @model + * @generated + */ +public enum TenantTableDiscriminatorType implements Enumerator +{ + /** + * The 'SCHEMA' literal object. + * + * + * @see #SCHEMA_VALUE + * @generated + * @ordered + */ + SCHEMA(0, "SCHEMA", "SCHEMA"), + + /** + * The 'SUFFIX' literal object. + * + * + * @see #SUFFIX_VALUE + * @generated + * @ordered + */ + SUFFIX(1, "SUFFIX", "SUFFIX"), + + /** + * The 'PREFIX' literal object. + * + * + * @see #PREFIX_VALUE + * @generated + * @ordered + */ + PREFIX(2, "PREFIX", "PREFIX"); + + /** + * The 'SCHEMA' literal value. + * + *

+ * If the meaning of 'SCHEMA' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #SCHEMA + * @model + * @generated + * @ordered + */ + public static final int SCHEMA_VALUE = 0; + + /** + * The 'SUFFIX' literal value. + * + *

+ * If the meaning of 'SUFFIX' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #SUFFIX + * @model + * @generated + * @ordered + */ + public static final int SUFFIX_VALUE = 1; + + /** + * The 'PREFIX' literal value. + * + *

+ * If the meaning of 'PREFIX' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #PREFIX + * @model + * @generated + * @ordered + */ + public static final int PREFIX_VALUE = 2; + + /** + * An array of all the 'Tenant Table Discriminator Type' enumerators. + * + * + * @generated + */ + private static final TenantTableDiscriminatorType[] VALUES_ARRAY = + new TenantTableDiscriminatorType[] + { + SCHEMA, + SUFFIX, + PREFIX, + }; + + /** + * A public read-only list of all the 'Tenant Table Discriminator Type' enumerators. + * + * + * @generated + */ + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); + + /** + * Returns the 'Tenant Table Discriminator Type' literal with the specified literal value. + * + * + * @generated + */ + public static TenantTableDiscriminatorType get(String literal) + { + for (int i = 0; i < VALUES_ARRAY.length; ++i) + { + TenantTableDiscriminatorType result = VALUES_ARRAY[i]; + if (result.toString().equals(literal)) + { + return result; + } + } + return null; + } + + /** + * Returns the 'Tenant Table Discriminator Type' literal with the specified name. + * + * + * @generated + */ + public static TenantTableDiscriminatorType getByName(String name) + { + for (int i = 0; i < VALUES_ARRAY.length; ++i) + { + TenantTableDiscriminatorType result = VALUES_ARRAY[i]; + if (result.getName().equals(name)) + { + return result; + } + } + return null; + } + + /** + * Returns the 'Tenant Table Discriminator Type' literal with the specified integer value. + * + * + * @generated + */ + public static TenantTableDiscriminatorType get(int value) + { + switch (value) + { + case SCHEMA_VALUE: return SCHEMA; + case SUFFIX_VALUE: return SUFFIX; + case PREFIX_VALUE: return PREFIX; + } + return null; + } + + /** + * + * + * @generated + */ + private final int value; + + /** + * + * + * @generated + */ + private final String name; + + /** + * + * + * @generated + */ + private final String literal; + + /** + * Only this class can construct instances. + * + * + * @generated + */ + private TenantTableDiscriminatorType(int value, String name, String literal) + { + this.value = value; + this.name = name; + this.literal = literal; + } + + /** + * + * + * @generated + */ + public int getValue() + { + return value; + } + + /** + * + * + * @generated + */ + public String getName() + { + return name; + } + + /** + * + * + * @generated + */ + public String getLiteral() + { + return literal; + } + + /** + * Returns the literal value of the enumerator, which is its string representation. + * + * + * @generated + */ + @Override + public String toString() + { + return literal; + } + +} //TenantTableDiscriminatorType Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java,v retrieving revision 1.1 diff -u -r1.1 XmlBasic_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java 2 Sep 2011 20:59:38 -0000 1.1 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java 24 May 2012 01:29:09 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** * @@ -19,18 +18,44 @@ *

* The following features are supported: *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getField Field}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex Cache Index}
    • *
*

* * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject * @generated */ -public interface XmlBasic_2_4 extends JpaEObject +public interface XmlBasic_2_4 extends XmlGeneratorContainer2_4 { /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4_Field() + * @model containment="true" + * @generated + */ + XmlField_2_4 getField(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + void setField(XmlField_2_4 value); + + /** * Returns the value of the 'Cache Index' containment reference. * *

Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java,v retrieving revision 1.1 diff -u -r1.1 XmlElementCollection_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java 2 Sep 2011 20:59:38 -0000 1.1 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java 24 May 2012 01:29:09 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -19,6 +19,7 @@ *

* The following features are supported: *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#getField Field}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll Delete All}
    • *
*

@@ -31,6 +32,32 @@ public interface XmlElementCollection_2_4 extends JpaEObject { /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4_Field() + * @model containment="true" + * @generated + */ + XmlField_2_4 getField(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + void setField(XmlField_2_4 value); + + /** * Returns the value of the 'Delete All' attribute. * *

Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbeddable_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Embeddable 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4#getNoSql No Sql}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlEmbeddable_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'No Sql' containment reference. + * + *

+ * If the meaning of the 'No Sql' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'No Sql' containment reference. + * @see #setNoSql(XmlNoSql_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbeddable_2_4_NoSql() + * @model containment="true" + * @generated + */ + XmlNoSql_2_4 getNoSql(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbeddable_2_4#getNoSql No Sql}' containment reference. + * + * + * @param value the new value of the 'No Sql' containment reference. + * @see #getNoSql() + * @generated + */ + void setNoSql(XmlNoSql_2_4 value); + +} // XmlEmbeddable_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEmbedded_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Embedded 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4#getField Field}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlEmbedded_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEmbedded_2_4_Field() + * @model containment="true" + * @generated + */ + XmlField_2_4 getField(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEmbedded_2_4#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + void setField(XmlField_2_4 value); + +} // XmlEmbedded_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntityMappings_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Entity Mappings 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntityMappings_2_4#getUuidGenerators Uuid Generators}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlEntityMappings_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Uuid Generators' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlUuidGenerator_2_4}. + * + *

+ * If the meaning of the 'Uuid Generators' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generators' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntityMappings_2_4_UuidGenerators() + * @model containment="true" + * @generated + */ + EList getUuidGenerators(); + +} // XmlEntityMappings_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java,v retrieving revision 1.1 diff -u -r1.1 XmlEntity_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java 2 Sep 2011 20:59:38 -0000 1.1 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java 24 May 2012 01:29:11 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,8 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; - /** * * A representation of the model object 'Xml Entity 24'. @@ -20,15 +18,15 @@ * The following features are supported: *
    *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex Cache Index}
    • + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getNoSql No Sql}
    • *
*

* * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject * @generated */ -public interface XmlEntity_2_4 extends JpaEObject +public interface XmlEntity_2_4 extends XmlGeneratorContainer2_4 { /** * Returns the value of the 'Cache Index' containment reference. @@ -56,4 +54,30 @@ */ void setCacheIndex(XmlCacheIndex_2_4 value); + /** + * Returns the value of the 'No Sql' containment reference. + * + *

+ * If the meaning of the 'No Sql' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'No Sql' containment reference. + * @see #setNoSql(XmlNoSql_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4_NoSql() + * @model containment="true" + * @generated + */ + XmlNoSql_2_4 getNoSql(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getNoSql No Sql}' containment reference. + * + * + * @param value the new value of the 'No Sql' containment reference. + * @see #getNoSql() + * @generated + */ + void setNoSql(XmlNoSql_2_4 value); + } // XmlEntity_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlField_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Field 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4#getName Name}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlField_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlField_2_4_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlField_2_4#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + +} // XmlField_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlGeneratorContainer2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer; + +/** + * + * A representation of the model object 'Xml Generator Container2 4'. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4#getUuidGenerator Uuid Generator}
    • + *
+ *

+ * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlGeneratorContainer2_4() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlGeneratorContainer2_4 extends XmlGeneratorContainer +{ + /** + * Returns the value of the 'Uuid Generator' containment reference. + * + *

+ * If the meaning of the 'Uuid Generator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Uuid Generator' containment reference. + * @see #setUuidGenerator(XmlUuidGenerator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlGeneratorContainer2_4_UuidGenerator() + * @model containment="true" + * @generated + */ + XmlUuidGenerator_2_4 getUuidGenerator(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlGeneratorContainer2_4#getUuidGenerator Uuid Generator}' containment reference. + * + * + * @param value the new value of the 'Uuid Generator' containment reference. + * @see #getUuidGenerator() + * @generated + */ + void setUuidGenerator(XmlUuidGenerator_2_4 value); + +} // XmlGeneratorContainer2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java,v retrieving revision 1.1 diff -u -r1.1 XmlId_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java 2 Sep 2011 20:59:38 -0000 1.1 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java 24 May 2012 01:29:11 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,8 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; - /** * * A representation of the model object 'Xml Id 24'. @@ -19,18 +17,44 @@ *

* The following features are supported: *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getField Field}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex Cache Index}
    • *
*

* * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject * @generated */ -public interface XmlId_2_4 extends JpaEObject +public interface XmlId_2_4 extends XmlGeneratorContainer2_4 { /** + * Returns the value of the 'Field' containment reference. + * + *

+ * If the meaning of the 'Field' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Field' containment reference. + * @see #setField(XmlField_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4_Field() + * @model containment="true" + * @generated + */ + XmlField_2_4 getField(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getField Field}' containment reference. + * + * + * @param value the new value of the 'Field' containment reference. + * @see #getField() + * @generated + */ + void setField(XmlField_2_4 value); + + /** * Returns the value of the 'Cache Index' containment reference. * *

Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlJoinField_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Join Field 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getName Name}
    • + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getReferencedFieldName Referenced Field Name}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlJoinField_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Name' attribute. + * + *

+ * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlJoinField_2_4_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the 'Referenced Field Name' attribute. + * + *

+ * If the meaning of the 'Referenced Field Name' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Referenced Field Name' attribute. + * @see #setReferencedFieldName(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlJoinField_2_4_ReferencedFieldName() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getReferencedFieldName(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4#getReferencedFieldName Referenced Field Name}' attribute. + * + * + * @param value the new value of the 'Referenced Field Name' attribute. + * @see #getReferencedFieldName() + * @generated + */ + void setReferencedFieldName(String value); + +} // XmlJoinField_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToMany_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Many To Many 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToMany_2_4#getJoinFields Join Fields}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlManyToMany_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToMany_2_4_JoinFields() + * @model containment="true" + * @generated + */ + EList getJoinFields(); + +} // XmlManyToMany_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlManyToOne_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Many To One 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlManyToOne_2_4#getJoinFields Join Fields}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlManyToOne_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlManyToOne_2_4_JoinFields() + * @model containment="true" + * @generated + */ + EList getJoinFields(); + +} // XmlManyToOne_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java,v retrieving revision 1.1 diff -u -r1.1 XmlMappedSuperclass_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java 2 Sep 2011 20:59:38 -0000 1.1 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java 24 May 2012 01:29:12 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,8 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; -import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; - /** * * A representation of the model object 'Xml Mapped Superclass 24'. @@ -25,10 +23,9 @@ * * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4() * @model kind="class" interface="true" abstract="true" - * @extends JpaEObject * @generated */ -public interface XmlMappedSuperclass_2_4 extends JpaEObject +public interface XmlMappedSuperclass_2_4 extends XmlGeneratorContainer2_4 { /** * Returns the value of the 'Cache Index' containment reference. Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java,v retrieving revision 1.2 diff -u -r1.2 XmlMultitenant_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java 21 Dec 2011 21:07:02 -0000 1.2 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java 24 May 2012 01:29:12 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -21,6 +21,7 @@ * The following features are supported: *
    *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria Include Criteria}
    • + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getTenantTableDiscriminator Tenant Table Discriminator}
    • *
*

* @@ -57,6 +58,32 @@ */ void setIncludeCriteria(Boolean value); + /** + * Returns the value of the 'Tenant Table Discriminator' containment reference. + * + *

+ * If the meaning of the 'Tenant Table Discriminator' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Tenant Table Discriminator' containment reference. + * @see #setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4_TenantTableDiscriminator() + * @model containment="true" + * @generated + */ + XmlTenantTableDiscriminator_2_4 getTenantTableDiscriminator(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getTenantTableDiscriminator Tenant Table Discriminator}' containment reference. + * + * + * @param value the new value of the 'Tenant Table Discriminator' containment reference. + * @see #getTenantTableDiscriminator() + * @generated + */ + void setTenantTableDiscriminator(XmlTenantTableDiscriminator_2_4 value); + TextRange getIncludeCriteriaTextRange(); } // XmlMultitenant_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlNoSql_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,96 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml No Sql 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataType Data Type}
    • + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataFormat Data Format}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlNoSql_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Data Type' attribute. + * + *

+ * If the meaning of the 'Data Type' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Data Type' attribute. + * @see #setDataType(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlNoSql_2_4_DataType() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getDataType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataType Data Type}' attribute. + * + * + * @param value the new value of the 'Data Type' attribute. + * @see #getDataType() + * @generated + */ + void setDataType(String value); + + /** + * Returns the value of the 'Data Format' attribute. + * The default value is "". + * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType}. + * + *

+ * If the meaning of the 'Data Format' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Data Format' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @see #setDataFormat(DataFormatType) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlNoSql_2_4_DataFormat() + * @model default="" + * @generated + */ + DataFormatType getDataFormat(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlNoSql_2_4#getDataFormat Data Format}' attribute. + * + * + * @param value the new value of the 'Data Format' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.DataFormatType + * @see #getDataFormat() + * @generated + */ + void setDataFormat(DataFormatType value); + +} // XmlNoSql_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java =================================================================== RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java,v retrieving revision 1.1 diff -u -r1.1 XmlOneToMany_2_4.java --- src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java 2 Sep 2011 20:59:38 -0000 1.1 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java 24 May 2012 01:29:13 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,6 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; +import org.eclipse.emf.common.util.EList; import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; /** @@ -19,6 +20,7 @@ *

* The following features are supported: *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#getJoinFields Join Fields}
    • *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll Delete All}
    • *
*

@@ -31,6 +33,22 @@ public interface XmlOneToMany_2_4 extends JpaEObject { /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4_JoinFields() + * @model containment="true" + * @generated + */ + EList getJoinFields(); + + /** * Returns the value of the 'Delete All' attribute. * *

Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToOne_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml One To One 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToOne_2_4#getJoinFields Join Fields}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlOneToOne_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Join Fields' containment reference list. + * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlJoinField_2_4}. + * + *

+ * If the meaning of the 'Join Fields' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Join Fields' containment reference list. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToOne_2_4_JoinFields() + * @model containment="true" + * @generated + */ + EList getJoinFields(); + +} // XmlOneToOne_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlTenantTableDiscriminator_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,95 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject; + +/** + * + * A representation of the model object 'Xml Tenant Table Discriminator 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getContextProperty Context Property}
    • + *
  • {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getType Type}
    • + *
+ *

+ * + * @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 + * @generated + */ +public interface XmlTenantTableDiscriminator_2_4 extends JpaEObject +{ + /** + * Returns the value of the 'Context Property' attribute. + * + *

+ * If the meaning of the 'Context Property' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Context Property' attribute. + * @see #setContextProperty(String) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlTenantTableDiscriminator_2_4_ContextProperty() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getContextProperty(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getContextProperty Context Property}' attribute. + * + * + * @param value the new value of the 'Context Property' attribute. + * @see #getContextProperty() + * @generated + */ + void setContextProperty(String value); + + /** + * Returns the value of the 'Type' attribute. + * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType}. + * + *

+ * If the meaning of the 'Type' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Type' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @see #setType(TenantTableDiscriminatorType) + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlTenantTableDiscriminator_2_4_Type() + * @model + * @generated + */ + TenantTableDiscriminatorType getType(); + + /** + * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlTenantTableDiscriminator_2_4#getType Type}' attribute. + * + * + * @param value the new value of the 'Type' attribute. + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.TenantTableDiscriminatorType + * @see #getType() + * @generated + */ + void setType(TenantTableDiscriminatorType value); + +} // XmlTenantTableDiscriminator_2_4 Index: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlUuidGenerator_2_4.java =================================================================== RCS file: src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlUuidGenerator_2_4.java diff -N src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlUuidGenerator_2_4.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlUuidGenerator_2_4.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4; + +import org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator; + +/** + * + * A representation of the model object 'Xml Uuid Generator 24'. + * + * Provisional API: This interface is part of an interim API that is still + * under development and expected to change significantly before reaching + * stability. It is available at this early stage to solicit feedback from + * pioneering adopters on the understanding that any code that uses this API + * will almost certainly be broken (repeatedly) as the API evolves. + * + * + * + * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlUuidGenerator_2_4() + * @model kind="class" interface="true" abstract="true" + * @generated + */ +public interface XmlUuidGenerator_2_4 extends XmlGenerator +{ + +} // XmlUuidGenerator_2_4